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.10 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 02:32:35 2006 UTC

… …
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM; 30use Pod::POM;
31use Event; 31use Event;
32 32
33use Crossfire; 33use Crossfire;
34use Crossfire::Protocol; 34use Crossfire::Protocol::Constants;
35 35
36use Compress::LZF; 36use Compress::LZF;
37 37
38use CFClient; 38use CFClient;
39use CFClient::OpenGL (); 39use CFClient::OpenGL ();
40use CFClient::Protocol;
40use CFClient::UI; 41use CFClient::UI;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$Event::DIED = sub { 44$Event::DIED = sub {
44 # TODO: display dialog box or so 45 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable
45 CFClient::error $_[1]; 47 CFClient::error $_[1];
46}; 48};
47 49
48#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 50#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
49 51
… …
51 53
52my $MAX_FPS = 60; 54my $MAX_FPS = 60;
53my $MIN_FPS = 5; # unused as of yet 55my $MIN_FPS = 5; # unused as of yet
54 56
55our $META_SERVER = "crossfire.real-time.com:13326"; 57our $META_SERVER = "crossfire.real-time.com:13326";
56
57our $FACEMAP;
58our $TILECACHE;
59our $MAPCACHE;
60 58
61our $LAST_REFRESH; 59our $LAST_REFRESH;
62our $NOW; 60our $NOW;
63 61
64our $CFG; 62our $CFG;
… …
84our $LOGVIEW; 82our $LOGVIEW;
85our $CONSOLE; 83our $CONSOLE;
86our $METASERVER; 84our $METASERVER;
87our $LOGIN_BUTTON; 85our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 86our $QUIT_DIALOG;
87our $HOST_ENTRY;
88
89our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK;
91our $SETUP_SERVER;
92our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
89 94
90our $FLOORBOX; 95our $FLOORBOX;
91our $GAUGES; 96our $GAUGES;
92our $STATWIDS; 97our $STATWIDS;
93 98
… …
100 105
101our $ALT_ENTER_MESSAGE; 106our $ALT_ENTER_MESSAGE;
102our $STATUSBOX; 107our $STATUSBOX;
103our $DEBUG_STATUS; 108our $DEBUG_STATUS;
104 109
105our $INVWIN; 110our $INV_WINDOW;
106our $INV; 111our $INV;
107our $INVR; 112our $INVR;
108our $INVR_LBL; 113our $INV_RIGHT_HB;
114
115our $BIND_EDITOR;
116
117our $PICKUP_CFG;
109 118
110sub status { 119sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 121}
113 122
114sub debug { 123sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 124 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
118} 125}
119 126
120sub start_game { 127sub start_game {
121 status "logging in..."; 128 status "logging in...";
122 129
130 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide;
132
123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 133 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
124 134
125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 135 my ($host, $port) = split /:/, $CFG->{host};
136
126 $MAP = new CFClient::Map $mapsize, $mapsize; 137 $MAP = new CFClient::Map $mapsize, $mapsize;
127
128 my ($host, $port) = split /:/, $CFG->{host};
129 138
130 $CONN = eval { 139 $CONN = eval {
131 new conn 140 new CFClient::Protocol
132 host => $host, 141 host => $host,
133 port => $port || 13327, 142 port => $port || 13327,
134 user => $CFG->{user}, 143 user => $CFG->{user},
135 pass => $CFG->{password}, 144 pass => $CFG->{password},
136 mapw => $mapsize, 145 mapw => $mapsize,
137 maph => $mapsize, 146 maph => $mapsize,
138 ; 147
148 map_widget => $MAPWIDGET,
149 logview => $LOGVIEW,
150 statusbox => $STATUSBOX,
151 map => $MAP,
152 mapmap => $MAPMAP,
153
154 sound_play => sub {
155 my ($x, $y, $soundnum, $type) = @_;
156
157 $SDL_MIXER
158 or return;
159
160 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
161 or return;
162
163 $chunk->play;
164 },
139 }; 165 };
140 166
141 if ($CONN) { 167 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh}; 168 CFClient::lowdelay fileno $CONN->{fh};
143 169
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful"; 170 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else { 171 } else {
151 status "unable to connect"; 172 status "unable to connect";
152 stop_game(); 173 stop_game();
153 } 174 }
154} 175}
155 176
156sub stop_game { 177sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login");
179 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide;
181 $LOGVIEW->hide;
182
157 return unless $CONN; 183 return unless $CONN;
158 184
159 status "connection closed"; 185 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login"); 186
161 $CONN->destroy; 187 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
168 undef $MAP;
169} 189}
170 190
171sub client_setup { 191sub graphics_setup {
172 my $dialog = new CFClient::UI::FancyFrame
173 title => "Client Setup",
174 child => (my $vbox = new CFClient::UI::VBox); 192 my $vbox = new CFClient::UI::VBox;
193
175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 194 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
176 195
177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 196 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
179 198
180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 199 $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]);
181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 200 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
182 201
183 $mode_slider->connect (changed => sub { 202 $mode_slider->connect (changed => sub {
184 my ($self, $value) = @_; 203 my ($self, $value) = @_;
185 204
… …
192 211
193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
194 $table->add (1, $row++, new CFClient::UI::CheckBox 213 $table->add (1, $row++, new CFClient::UI::CheckBox
195 state => $CFG->{fullscreen}, 214 state => $CFG->{fullscreen},
196 tooltip => "Bring the client into fullscreen mode.", 215 tooltip => "Bring the client into fullscreen mode.",
197 connect_changed => sub { 216 on_changed => sub {
198 my ($self, $value) = @_; 217 my ($self, $value) = @_;
199 $CFG->{fullscreen} = $value; 218 $CFG->{fullscreen} = $value;
200 } 219 }
201 ); 220 );
202 221
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fast}, 224 state => $CFG->{fast},
206 tooltip => "Lower the visual quality considerably to speed up rendering.", 225 tooltip => "Lower the visual quality considerably to speed up rendering.",
207 connect_changed => sub { 226 on_changed => sub {
208 my ($self, $value) = @_; 227 my ($self, $value) = @_;
209 $CFG->{fast} = $value; 228 $CFG->{fast} = $value;
210 } 229 }
211 ); 230 );
212 231
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
214 $table->add (1, $row++, new CFClient::UI::Slider 233 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
216 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
217 connect_changed => sub { 236 on_changed => sub {
218 my ($self, $value) = @_; 237 my ($self, $value) = @_;
219 $CFG->{map_scale} = 2 ** $value; 238 $CFG->{map_scale} = 2 ** $value;
220 } 239 }
221 ); 240 );
222 241
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 243 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fow_enable}, 244 state => $CFG->{fow_enable},
226 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 245 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
227 connect_changed => sub { 246 on_changed => sub {
228 my ($self, $value) = @_; 247 my ($self, $value) = @_;
229 $CFG->{fow_enable} = $value; 248 $CFG->{fow_enable} = $value;
230 } 249 }
231 ); 250 );
232 251
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
234 $table->add (1, $row++, new CFClient::UI::Slider 253 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
236 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
237 connect_changed => sub { 256 on_changed => sub {
238 my ($self, $value) = @_; 257 my ($self, $value) = @_;
239 $CFG->{fow_intensity} = $value; 258 $CFG->{fow_intensity} = $value;
240 } 259 }
241 ); 260 );
242 261
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 263 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_smooth}, 264 state => $CFG->{fow_smooth},
246 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 265 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
247 connect_changed => sub { 266 on_changed => sub {
248 my ($self, $value) = @_; 267 my ($self, $value) = @_;
249 $CFG->{fow_smooth} = $value; 268 $CFG->{fow_smooth} = $value;
250 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 269 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
251 } 270 }
252 ); 271 );
253 272
254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
255 $table->add (1, $row++, new CFClient::UI::Slider 274 $table->add (1, $row++, new CFClient::UI::Slider
256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
257 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 276 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
259 ); 278 );
260 279
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
262 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
264 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
266 ); 285 );
267 286
268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
269 288
270 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
272 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
273 connect_changed => sub { 292 on_changed => sub {
274 $CFG->{stat_fontsize} = $_[1]; 293 $CFG->{stat_fontsize} = $_[1];
275 &set_stats_window_fontsize; 294 &set_stats_window_fontsize;
276 } 295 }
277 ); 296 );
278 297
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 299 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
283 connect_changed => sub { 302 on_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1]; 303 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize; 304 &set_gauge_window_fontsize;
286 } 305 }
287 ); 306 );
288 307
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290 $table->add (1, $row++, new CFClient::UI::Slider 309 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_size}, 0.2, 0.8], 310 range => [$CFG->{gauge_size}, 0.2, 0.8],
292 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 311 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 312 on_changed => sub {
294 $CFG->{gauge_size} = $_[1]; 313 $CFG->{gauge_size} = $_[1];
295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
296 } 315 }
297 ); 316 );
298 317
299 $table->add (1, $row++, new CFClient::UI::Button 318 $table->add (1, $row++, new CFClient::UI::Button
300 expand => 1, align => 0, text => "Apply", 319 expand => 1, align => 0, text => "Apply",
301 tooltip => "Apply the video settings", 320 tooltip => "Apply the video settings",
302 connect_activate => sub { 321 on_activate => sub {
303 video_shutdown (); 322 video_shutdown ();
304 video_init (); 323 video_init ();
305 } 324 }
306 ); 325 );
326
327 $vbox
328}
329
330sub audio_setup {
331 my $vbox = new CFClient::UI::VBox;
332
333 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
334
335 my $row = 0;
307 336
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 337 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
309 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
310 state => $CFG->{audio_enable}, 339 state => $CFG->{audio_enable},
311 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.", 340 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.",
312 connect_changed => sub { 341 on_changed => sub {
313 $CFG->{audio_enable} = $_[1]; 342 $CFG->{audio_enable} = $_[1];
314 } 343 }
315 ); 344 );
316# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 345# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
317# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 346# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
318# $CFG->{effects_volume} = $_[1]; 347# $CFG->{effects_volume} = $_[1];
319# }); 348# });
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 349 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
321 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 350 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
322 $hbox->add (new CFClient::UI::CheckBox 351 $hbox->add (new CFClient::UI::CheckBox
323 expand => 1, state => $CFG->{bgm_enable}, 352 expand => 1, state => $CFG->{bgm_enable},
324 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 353 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
325 connect_changed => sub { 354 on_changed => sub {
326 $CFG->{bgm_enable} = $_[1]; 355 $CFG->{bgm_enable} = $_[1];
327 } 356 }
328 ); 357 );
329 $hbox->add (new CFClient::UI::Slider 358 $hbox->add (new CFClient::UI::Slider
330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 359 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
331 tooltip => "The volume of the background music. Changes are instant.", 360 tooltip => "The volume of the background music. Changes are instant.",
332 connect_changed => sub { 361 on_changed => sub {
333 $CFG->{bgm_volume} = $_[1]; 362 $CFG->{bgm_volume} = $_[1];
334 CFClient::MixMusic::volume $_[1] * 128; 363 CFClient::MixMusic::volume $_[1] * 128;
335 } 364 }
336 ); 365 );
337 366
338 $table->add (1, $row++, new CFClient::UI::Button 367 $table->add (1, $row++, new CFClient::UI::Button
339 expand => 1, align => 0, text => "Apply", 368 expand => 1, align => 0, text => "Apply",
340 tooltip => "Apply the audio settings", 369 tooltip => "Apply the audio settings",
341 connect_activate => sub { 370 on_activate => sub {
342 audio_shutdown (); 371 audio_shutdown ();
343 audio_init (); 372 audio_init ();
344 } 373 }
345 ); 374 );
346 375
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $vbox
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 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. "
351 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
359 $dialog
360} 377}
361 378
362sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
363 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
364 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
373 390
374sub make_gauge_window { 391sub make_gauge_window {
375 my $gh = int $HEIGHT * $CFG->{gauge_size}; 392 my $gh = int $HEIGHT * $CFG->{gauge_size};
376 393
377 my $win = new CFClient::UI::Frame ( 394 my $win = new CFClient::UI::Frame (
378 req_y => -1, 395 force_x => 0,
396 force_y => "max",
379 user_w => $WIDTH, 397 force_w => $WIDTH,
380 user_h => $gh, 398 force_h => $gh,
381 ); 399 );
382 400
383 $win->add (my $hbox = new CFClient::UI::HBox 401 $win->add (my $hbox = new CFClient::UI::HBox
384 children => [ 402 children => [
385 (new CFClient::UI::HBox expand => 1), 403 (new CFClient::UI::HBox expand => 1),
… …
421 &set_gauge_window_fontsize; 439 &set_gauge_window_fontsize;
422 440
423 $win 441 $win
424} 442}
425 443
444
426sub make_stats_window { 445sub make_stats_window {
427 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 446 my $tgw = new CFClient::UI::FancyFrame
447 y => $HEIGHT * (2/8),
448 x => "max",
449 title => "Stats",
450 name => "stats_window";
428 451
429 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 452 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
430 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 453 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1, 454 can_hover => 1, can_events => 1,
432 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 455 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
435 tooltip => "The map you are currently on (if supported by the server)."); 458 tooltip => "The map you are currently on (if supported by the server).");
436 459
437 $vb->add (my $hb0 = new CFClient::UI::HBox); 460 $vb->add (my $hb0 = new CFClient::UI::HBox);
438 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 461 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
439 can_hover => 1, can_events => 1, 462 can_hover => 1, can_events => 1,
440 tooltip => "This is the amount the Player weights."); 463 tooltip => "The weight of the player including all inventory items.");
441 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 464 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
442 can_hover => 1, can_events => 1, 465 can_hover => 1, can_events => 1,
443 tooltip => "The weight limit, you can't carry more than this."); 466 tooltip => "The weight limit: you cannot carry more than this.");
444 467
445 468
446 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 469 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
447 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 470 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
448 471
… …
531 update_stats_window ({}); 554 update_stats_window ({});
532 555
533 $tgw 556 $tgw
534} 557}
535 558
536sub formsep { 559sub formsep($) {
537 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
538} 561}
539 562
540sub update_stats_window { 563sub update_stats_window {
541 my ($stats) = @_; 564 my ($stats) = @_;
542 565
543 # i love text protocols!!! 566 # I love text protocols...
567
544 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 568 my $hp = $stats->{+CS_STAT_HP} * 1;
545 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 569 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
546 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 570 my $sp = $stats->{+CS_STAT_SP} * 1;
547 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 571 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
548 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 572 my $fo = $stats->{+CS_STAT_FOOD} * 1;
549 my $fo_m = 999; 573 my $fo_m = 999;
550 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 574 my $gr = $stats->{+CS_STAT_GRACE} * 1;
551 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 575 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
552 576
553 $GAUGES->{hp} ->set_value ($hp, $hp_m); 577 $GAUGES->{hp} ->set_value ($hp, $hp_m);
554 $GAUGES->{mana} ->set_value ($sp, $sp_m); 578 $GAUGES->{mana} ->set_value ($sp, $sp_m);
555 $GAUGES->{food} ->set_value ($fo, $fo_m); 579 $GAUGES->{food} ->set_value ($fo, $fo_m);
556 $GAUGES->{grace} ->set_value ($gr, $gr_m); 580 $GAUGES->{grace} ->set_value ($gr, $gr_m);
557 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 581 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
558 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 582 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
559 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 583 my $rng = $stats->{+CS_STAT_RANGE};
560 $rng =~ s/^Range: //; # thank you so much dear server 584 $rng =~ s/^Range: //; # thank you so much dear server
561 $GAUGES->{range} ->set_text ("Rng: " . $rng); 585 $GAUGES->{range} ->set_text ("Rng: " . $rng);
562 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 586 my $title = $stats->{+CS_STAT_TITLE};
563 $title =~ s/^Player: //; 587 $title =~ s/^Player: //;
564 $STATWIDS->{title} ->set_text ("Title: " . $title); 588 $STATWIDS->{title} ->set_text ("Title: " . $title);
565 589
566 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 590 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
567 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 591 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
568 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 592 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
569 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 593 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
570 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 594 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
571 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 595 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
572 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 596 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
573 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 597 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
574 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 598 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
575 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 599 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
576 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 600 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
577 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED}); 601 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
578 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP}); 602 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
579 603
580 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::CS_STAT_WEIGHT_LIM} / 1000); 604 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
581 605
606 # TODO: replace by CS_STAT_RES_xxx constants
582 my %tbl = ( 607 my %tbl = (
583 phys => 100, 608 phys => 100,
584 magic => 101, 609 magic => 101,
585 fire => 102, 610 fire => 102,
586 elec => 103, 611 elec => 103,
… …
595 tund => 112, 620 tund => 112,
596 fear => 113, 621 fear => 113,
597 depl => 113, 622 depl => 113,
598 deat => 115, 623 deat => 115,
599 holyw => 116, 624 holyw => 116,
600 blind => 117 625 blind => 117,
601 ); 626 );
602 627
603 for (keys %tbl) {
604 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
605 } 629 for keys %tbl;
606
607}
608
609sub metaserver_dialog {
610 my $dialog = new CFClient::UI::FancyFrame
611 title => "Server List",
612 child => (my $vbox = new CFClient::UI::VBox);
613
614 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
615
616 $dialog
617} 630}
618 631
619my $METASERVER_ATIME; 632my $METASERVER_ATIME;
620 633
621sub update_metaserver { 634sub update_metaserver {
622 my ($HOST) = @_;
623
624 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
625 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
626 637
627 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
628 $table->clear; 639 $table->clear;
… …
679 $m = [$users, $host, $uptime, $version, $desc]; 690 $m = [$users, $host, $uptime, $version, $desc];
680 691
681 $y++; 692 $y++;
682 693
683 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
684 (new CFClient::UI::Button text => "Use", connect_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
685 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
686 }), 698 }),
687 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
688 ]); 700 ]);
689 701
690 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
693 } 705 }
694 } 706 }
695 }); 707 });
696} 708}
697 709
710sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List",
713 name => 'metaserver_dialog',
714 x => 'center',
715 y => 'center',
716 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub {
718 update_metaserver if $_[1];
719 },
720 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog
725}
726
698sub server_setup { 727sub server_setup {
699 my $dialog = new CFClient::UI::FancyFrame
700 title => "Server Setup",
701 child => (my $vbox = new CFClient::UI::VBox); 728 my $vbox = new CFClient::UI::VBox;
702 729
703 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
704 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
705 732
706 { 733 {
707 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
708 735
709 $vbox->add ( 736 $vbox->add (
710 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
711 expand => 1, 738 expand => 1,
712 text => $CFG->{host}, 739 text => $CFG->{host},
713 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
714 connect_changed => sub { 741 on_changed => sub {
715 my ($self, $value) = @_; 742 my ($self, $value) = @_;
716 $CFG->{host} = $value; 743 $CFG->{host} = $value;
717 } 744 }
718 ); 745 );
719 746
720 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
721 748
722 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
723 expand => 1, 750 expand => 1,
724 text => "Server List", 751 text => "Server List",
725 other => $METASERVER, 752 other => $METASERVER,
726 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
727 connect_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
728 update_metaserver $HOST;
729 }
730 ); 755 );
731 } 756 }
732 757
733 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
734 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
735 text => $CFG->{user}, 760 text => $CFG->{user},
736 tooltip => "The name of your character on the server", 761 tooltip => "The name of your character on the server",
737 connect_changed => sub { 762 on_changed => sub {
738 my ($self, $value) = @_; 763 my ($self, $value) = @_;
739 $CFG->{user} = $value; 764 $CFG->{user} = $value;
740 } 765 }
741 ); 766 );
742 767
743 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
744 $table->add (1, 5, new CFClient::UI::Entry 769 $table->add (1, 5, new CFClient::UI::Entry
745 text => $CFG->{password}, 770 text => $CFG->{password},
746 hidden => 1, 771 hidden => 1,
747 tooltip => "The password for your character", 772 tooltip => "The password for your character",
748 connect_changed => sub { 773 on_changed => sub {
749 my ($self, $value) = @_; 774 my ($self, $value) = @_;
750 $CFG->{password} = $value; 775 $CFG->{password} = $value;
751 } 776 }
752 ); 777 );
753 778
754 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
755 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
756 req_w => 100, 781 force_w => 100,
757 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
758 tooltip => "This is the size of the portion of the map update the server sends you. " 783 tooltip => "This is the size of the portion of the map update the server sends you. "
759 . "If you set this to a high value you will be able to see further, " 784 . "If you set this to a high value you will be able to see further, "
760 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
761 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
762 connect_changed => sub { 787 on_changed => sub {
763 my ($self, $value) = @_; 788 my ($self, $value) = @_;
764 789
765 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
766 }, 791 },
767 ); 792 );
… …
774 . "This might increase or create lag, but increases the chances " 799 . "This might increase or create lag, but increases the chances "
775 . "of faces being ready for display when you encounter them. " 800 . "of faces being ready for display when you encounter them. "
776 . "It also uses up server bandwidth on every connect, " 801 . "It also uses up server bandwidth on every connect, "
777 . "so only set it if you really need to prefetch images. " 802 . "so only set it if you really need to prefetch images. "
778 . "This option can be set and unset any time.", 803 . "This option can be set and unset any time.",
779 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 804 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
780 ); 805 );
781 806
782 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
783 $table->add (1, 9, new CFClient::UI::Entry 808 $table->add (1, 9, new CFClient::UI::Entry
784 text => $CFG->{output_count}, 809 text => $CFG->{output_count},
785 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 810 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
786 connect_changed => sub { $CFG->{output_count} = $_[1] }, 811 on_changed => sub { $CFG->{output_count} = $_[1] },
787 ); 812 );
788 813
789 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
790 $table->add (1, 10, new CFClient::UI::Entry 815 $table->add (1, 10, new CFClient::UI::Entry
791 text => $CFG->{output_sync}, 816 text => $CFG->{output_sync},
792 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 817 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
793 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 818 on_changed => sub { $CFG->{output_sync} = $_[1] },
794 ); 819 );
795 820
796 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
797 expand => 1, 822 expand => 1,
798 align => 0, 823 align => 0,
799 text => "Login", 824 text => "Login",
800 connect_activate => sub { 825 on_activate => sub {
801 $CONN ? stop_game 826 $CONN ? stop_game
802 : start_game; 827 : start_game;
803 }, 828 },
804 ); 829 );
805 830
806 $dialog 831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
833 text => $CFG->{say_command},
834 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. "
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub {
838 my ($self, $value) = @_;
839 $CFG->{say_command} = $value;
840 }
841 );
842
843 $vbox
807} 844}
808 845
809sub message_window { 846sub message_window {
810 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
848 name => "message_window",
811 title => "Messages", 849 title => "Messages",
812 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
813 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
852 x => "max",
853 y => 0,
814 user_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
815 user_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
816 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
817 857
818 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
819 859
820 $vbox->add (my $input = new CFClient::UI::Entry 860 $vbox->add (my $input = new CFClient::UI::Entry
821 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 861 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
822 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 862 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
823 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 863 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
824 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 864 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
825 connect_focus_in => sub { 865 on_focus_in => sub {
826 my ($input, $prev_focus) = @_; 866 my ($input, $prev_focus) = @_;
827 867
828 delete $input->{refocus_map}; 868 delete $input->{refocus_map};
829 869
830 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
831 $input->{refocus_map} = 1; 871 $input->{refocus_map} = 1;
832 } 872 }
833 delete $input->{auto_activated}; 873 delete $input->{auto_activated};
834 }, 874 },
835 connect_activate => sub { 875 on_activate => sub {
836 my ($input, $text) = @_; 876 my ($input, $text) = @_;
837 $input->set_text (''); 877 $input->set_text ('');
838 878
839 if ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
840 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
… …
845 if ($input->{refocus_map}) { 885 if ($input->{refocus_map}) {
846 delete $input->{refocus_map}; 886 delete $input->{refocus_map};
847 $MAPWIDGET->focus_in 887 $MAPWIDGET->focus_in
848 } 888 }
849 }, 889 },
850 connect_escape => sub { 890 on_escape => sub {
851 $MAPWIDGET->focus_in 891 $MAPWIDGET->focus_in
852 }, 892 },
853 ); 893 );
854 894
855 $CONSOLE = { 895 $CONSOLE = {
856 window => $window, 896 window => $window,
857 input => $input 897 input => $input,
858 }; 898 };
859 899
860 $window 900 $window
861} 901}
862 902
863sub open_quit_dialog { 903sub open_quit_dialog {
864 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
865
866 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center",
907 y => "center",
908 title => "Really Quit?",
909 ;
867 910
868 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
869 912
870 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
871 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
… …
874 ); 917 );
875 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
876 $hb->add (new CFClient::UI::Button 919 $hb->add (new CFClient::UI::Button
877 text => "Ok", 920 text => "Ok",
878 expand => 1, 921 expand => 1,
879 connect_activate => sub { $QUIT_DIALOG->hide }, 922 on_activate => sub { $QUIT_DIALOG->hide },
880 ); 923 );
881 $hb->add (new CFClient::UI::Button 924 $hb->add (new CFClient::UI::Button
882 text => "Quit anyway", 925 text => "Quit anyway",
883 expand => 1, 926 expand => 1,
884 connect_activate => sub { exit }, 927 on_activate => sub { exit },
885 ); 928 );
929 }
886 930
887 $QUIT_DIALOG->show_centered; 931 $QUIT_DIALOG->show;
932}
933
934sub autopickup_setup {
935 my $vb = new CFClient::UI::VBox;
936
937 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942 my $tbl = 0;
943 my $tblrow = 0;
944
945 for (
946 ["General", $gen_tbl],
947 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
948 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
949 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
950 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
951 ["Weapons", $ltbl],
952 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
953 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
954 ["Bows" => CFClient::Pickup::PU_BOW],
955 ["Arrows" => CFClient::Pickup::PU_ARROW],
956 ["Armour"],
957 ["Helmets" => CFClient::Pickup::PU_HELMET],
958 ["Shields" => CFClient::Pickup::PU_SHIELD],
959 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
960 ["Boots" => CFClient::Pickup::PU_BOOTS],
961 ["Gloves" => CFClient::Pickup::PU_GLOVES],
962 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
963 ["Readables", $rtbl],
964 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
965 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
966 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
967 ["Misc"],
968 ["Food" => CFClient::Pickup::PU_FOOD],
969 ["Drinks" => CFClient::Pickup::PU_DRINK],
970 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
971 ["Keys" => CFClient::Pickup::PU_KEY],
972 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
973 ["Potions" => CFClient::Pickup::PU_POTION],
974 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
975 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
976 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
977 )
978 {
979 if (ref $_->[1]) {
980 $tbl = $_->[1];
981 $tblrow = 0;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
983 } elsif (not defined $_->[1]) {
984 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
888 } else { 985 } else {
889 $QUIT_DIALOG->show_centered; 986 my $mask = $_->[1];
987 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask,
990 on_changed => sub {
991 my ($box, $value) = @_;
992 if ($value) {
993 $::CFG->{pickup} |= $mask;
994 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
996 }
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
998 if defined $::CONN;
999 });
1000 }
890 } 1001 }
1002
1003 $vb
891} 1004}
892 1005
893sub make_inventory_window { 1006sub make_inventory_window {
894 my $invwin = new CFClient::UI::FancyFrame 1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
895 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1008 x => "center",
1009 y => "center",
1010 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10,
1012 title => "Inventory",
1013 ;
896 1014
897 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
898 1016
899 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1017 $hb->add (my $vb1 = new CFClient::UI::VBox);
900 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5); 1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
901 $lbl->set_text ("Player");
902 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
903 1020
904 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1021 $hb->add (my $vb2 = new CFClient::UI::VBox);
1022
905 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5); 1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
906 $INVR_LBL->set_text ("Floor"); 1024
907 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
908 1026
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
909 $invwin 1030 $invwin
1031}
1032
1033sub spell_setup {
1034 new CFClient::UI::SpellList
1035}
1036
1037sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox;
1039
1040 my $refresh;
1041 $refresh = sub {
1042 $binding_list->clear ();
1043
1044 for my $mod (keys %{$::CFG->{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048
1049 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button
1053 text => "delete",
1054 tooltip => "Deletes the binding",
1055 on_activate => sub {
1056 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym};
1058 });
1059
1060 $hb->add (new CFClient::UI::Button
1061 text => "edit",
1062 tooltip => "Edits the binding",
1063 on_activate => sub {
1064 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1066 sub {
1067 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1070 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show;
1073 },
1074 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show;
1077 });
1078 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide;
1080 });
1081
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084 }
1085 }
1086 };
1087
1088 my $vb = new CFClient::UI::VBox;
1089 $vb->add ($binding_list);
1090 $vb->add (my $hb = new CFClient::UI::HBox);
1091
1092 $hb->add (new CFClient::UI::Button
1093 text => "record new",
1094 expand => 1,
1095 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub {
1099 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1101 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show;
1104 },
1105 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show;
1108 });
1109 $SETUP_DIALOG->hide;
1110 $::BIND_EDITOR->show;
1111 },
1112 );
1113
1114 $hb->add (new CFClient::UI::Button
1115 text => "close",
1116 tooltip => "Closes the binding window",
1117 expand => 1,
1118 on_activate => sub {
1119 $SETUP_DIALOG->hide;
1120 }
1121 );
1122
1123 $refresh->();
1124
1125 $vb
910} 1126}
911 1127
912sub make_help_window { 1128sub make_help_window {
913 my $win = new CFClient::UI::FancyFrame 1129 my $win = new CFClient::UI::FancyFrame
914 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1130 x => 'center',
1131 y => 'center',
1132 name => 'doc_browser',
1133 force_w => int $WIDTH * 7/8,
1134 force_h => int $HEIGHT * 7/8,
1135 title => "Documentation";
915 1136
916 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
917 1138
918 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
919 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
926 ) { 1147 ) {
927 my ($pod, $label) = @$_; 1148 my ($pod, $label) = @$_;
928 1149
929 $buttons->add (new CFClient::UI::Button 1150 $buttons->add (new CFClient::UI::Button
930 text => $label, 1151 text => $label,
931 connect_activate => sub { 1152 on_activate => sub {
932 my $parser = new Pod::POM; 1153 my $parser = new Pod::POM;
933 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1154 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
934 1155
935 $viewer->clear; 1156 $viewer->clear;
936 1157
… …
980 if ($DEBUG_STATUS) { 1201 if ($DEBUG_STATUS) {
981 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1202 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
982 } else { 1203 } else {
983 # create the widgets 1204 # create the widgets
984 1205
985 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1206 $DEBUG_STATUS = new CFClient::UI::Label
1207 padding => 0,
1208 z => 100,
1209 force_x => "max",
1210 force_y => 0;
986 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
987 1212
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214
988 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
989 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
990 1217
991 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
992 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
993 req_y => -1, 1220 force_x => 0,
1221 force_y => "max",
994 child => $STATUSBOX, 1222 child => $STATUSBOX,
995 )->show; 1223 )->show;
996 1224
997 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1228 x => 0,
1229 y => $FONTSIZE + 8,
998 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
999 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1000 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1001 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1233 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1002 ), 1234 ),
… …
1025 can_hover => 1, 1257 can_hover => 1,
1026 can_events => 1, 1258 can_events => 1,
1027 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1028 ; 1260 ;
1029 1261
1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup",
1264 name => "setup_dialog",
1265 x => 'center',
1266 y => 'center',
1267 force_w => $::WIDTH * 0.6,
1268 force_h => $::HEIGHT * 0.6,
1269 ;
1270
1271 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1272 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1273
1274 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1275 "Configure the server to play on, your username, password and other server-related options.");
1276 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1277 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1278 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1279 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1280 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1281 "Configure the use of audio, sound effects and background music.");
1282 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1283 "Lets you define, edit and delete bindings."
1284 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "
1285 . "with nothing set and the recording started. After doing the actions you "
1286 . "want to record press Insert and you will be asked to press a key-combo."
1287 . "After pressing the combo the binding will be saved automatically and the "
1288 . "binding editor closes");
1289 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1290 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1291
1030 $BUTTONBAR = new CFClient::UI::HBox; 1292 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1031 1293
1032 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1033 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1295 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1034 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1296
1035 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1036 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1037 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1298 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1038 1299
1039 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 1300 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
1040 1301
1041 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1302 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1042 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1303 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1043 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1304 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1044 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1305 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1306 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1045 1307
1046 $BUTTONBAR->add (new CFClient::UI::Button 1308 $BUTTONBAR->add (new CFClient::UI::Button
1047 text => "Save Config", 1309 text => "Save Config",
1048 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1310 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1049 connect_activate => sub { 1311 on_activate => sub {
1312 $::CFG->{layout} = CFClient::UI::get_layout;
1050 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1313 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1051 status "Configuration Saved"; 1314 status "Configuration Saved";
1052 }, 1315 },
1053 ); 1316 );
1054 1317
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1318 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1056 tooltip => "View Documentation"); 1319 tooltip => "View Documentation");
1057 1320
1058 $BUTTONBAR->add (new CFClient::UI::Button 1321 $BUTTONBAR->add (new CFClient::UI::Button
1059 text => "Quit", 1322 text => "Quit",
1060 tooltip => "Terminates the program", 1323 tooltip => "Terminates the program",
1061 connect_activate => sub { 1324 on_activate => sub {
1062 if ($CONN) { 1325 if ($CONN) {
1063 open_quit_dialog; 1326 open_quit_dialog;
1064 } else { 1327 } else {
1065 exit; 1328 exit;
1066 } 1329 }
1067 }, 1330 },
1068 ); 1331 );
1069 1332
1070 $BUTTONBAR->show; 1333 $BUTTONBAR->show;
1334 $SETUP_DIALOG->show;
1335 }
1071 1336
1072 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1337 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1073
1074 # delay till geometry is constant
1075 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1076 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1077 my $widget = $GAUGES->{win};
1078 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1079 });
1080 force_refresh ();
1081 }
1082} 1338}
1083 1339
1084sub video_shutdown { 1340sub video_shutdown {
1085 undef $SDL_ACTIVE; 1341 undef $SDL_ACTIVE;
1086} 1342}
… …
1153 1409
1154my %demo;#d# 1410my %demo;#d#
1155 1411
1156sub force_refresh { 1412sub force_refresh {
1157 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1413 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1158 debug sprintf "%3.2f", $fps; 1414 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1159 1415
1160 $CFClient::UI::ROOT->draw; 1416 $CFClient::UI::ROOT->draw;
1161 1417
1162 $WANT_REFRESH = 0; 1418 $WANT_REFRESH = 0;
1163 $CAN_REFRESH = 0; 1419 $CAN_REFRESH = 0;
… …
1218}; 1474};
1219 1475
1220 CFClient::SDL_GL_SwapBuffers; 1476 CFClient::SDL_GL_SwapBuffers;
1221} 1477}
1222 1478
1223my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1479my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1224 $NOW = time; 1480 $NOW = time;
1225 1481
1226 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1482 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1227 for CFClient::SDL_PollEvent; 1483 for CFClient::SDL_PollEvent;
1228 1484
… …
1246sub animation_stop { 1502sub animation_stop {
1247 my ($widget) = @_; 1503 my ($widget) = @_;
1248 delete $animate_object{$widget}; 1504 delete $animate_object{$widget};
1249} 1505}
1250 1506
1251@conn::ISA = Crossfire::Protocol::;
1252
1253sub conn::new {
1254 my $class = shift;
1255
1256 my $self = $class->Crossfire::Protocol::new (@_);
1257
1258 $MAPWIDGET->clr_commands;
1259
1260 my $parser = new Pod::POM;
1261 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1262
1263 for my $head2 ($pod->head1->[-2]->head2) {
1264 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1265 or next;
1266
1267 my $cmd = $1;
1268 my @args = split /\|/, $2;
1269 @args = (".*") unless @args;
1270
1271 my $text = CFClient::pod_to_pango $head2->content;
1272
1273 for my $arg (@args) {
1274 $arg = $arg eq ".*" ? "" : " $arg";
1275
1276 $MAPWIDGET->add_command ("$cmd$arg", $text);
1277 }
1278 }
1279
1280 $self->{noface} = new_from_file CFClient::Texture
1281 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1282
1283 $self->{open_container} = 0;
1284
1285 $self
1286}
1287
1288sub conn::stats_update {
1289 my ($self, $stats) = @_;
1290
1291 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1292 my $diff = $exp - $self->{prev_exp};
1293 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1294 if exists $self->{prev_exp} && $diff;
1295 $self->{prev_exp} = $exp;
1296 }
1297
1298 update_stats_window ($stats);
1299}
1300
1301sub conn::user_send {
1302 my ($self, $command) = @_;
1303
1304 $self->send_command ($command);
1305 status $command;
1306}
1307
1308sub conn::map_scroll {
1309 my ($self, $dx, $dy) = @_;
1310
1311 $MAP->scroll ($dx, $dy);
1312}
1313
1314sub conn::feed_map1a {
1315 my ($self, $data) = @_;
1316
1317# $self->Crossfire::Protocol::feed_map1a ($data);
1318
1319 $MAP->map1a_update ($data);
1320 $MAPWIDGET->update;
1321}
1322
1323sub conn::flush_map {
1324 my ($self) = @_;
1325
1326 my $map_info = delete $self->{map_info}
1327 or return;
1328
1329 my ($hash, $x, $y, $w, $h) = @$map_info;
1330
1331 my $data = $MAP->get_rect ($x, $y, $w, $h);
1332 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
1333 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1334}
1335
1336sub conn::map_clear {
1337 my ($self) = @_;
1338
1339 $self->flush_map;
1340 delete $self->{neigh_map};
1341
1342 $MAP->clear;
1343}
1344
1345
1346sub conn::load_map($$$) {
1347 my ($self, $hash, $x, $y) = @_;
1348
1349 if (defined (my $data = $MAPCACHE->get ($hash))) {
1350 $data = Compress::LZF::decompress $data;
1351 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1352 for my $id ($MAP->set_rect ($x, $y, $data)) {
1353 my $data = $TILECACHE->get ($id)
1354 or next;
1355
1356 $self->set_texture ($id => $data);
1357 }
1358 }
1359}
1360
1361# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1362# (server resource,s latency, bandwidth), so this hack is warranted.
1363# the right fix is to make real tiled maps with an overview file
1364sub conn::send_mapinfo {
1365 my ($self, $data, $cb) = @_;
1366
1367 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1368 my ($wx, $wy) = ($1, $2);
1369
1370 if ($data =~ /^spatial ([1-4]+)$/) {
1371 my @dx = (0, 0, 1, 0, -1);
1372 my @dy = (0, -1, 0, 1, 0);
1373 my ($dx, $dy);
1374
1375 for (split //, $1) {
1376 $dx += $dx[$_];
1377 $dy += $dy[$_];
1378 }
1379
1380 $cb->(spatial => 15,
1381 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1382 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1383 50, 50,
1384 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1385 );
1386
1387 return;
1388 }
1389 }
1390
1391 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1392}
1393
1394# this method does a "flood fill" into every tile direction
1395# it assumes that tiles are arranged in a rectangular grid,
1396# i.e. a map is the same as the left of the right map etc.
1397# failure to comply are harmless and result in display errors
1398# at worst.
1399sub conn::flood_fill {
1400 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1401
1402 # the server does not allow map paths > 6
1403 return if 7 <= length $path;
1404
1405 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1406
1407 for (
1408 [1, 3, 0, -1],
1409 [2, 4, 1, 0],
1410 [3, 1, 0, 1],
1411 [4, 2, -1, 0],
1412 ) {
1413 my ($tile, $tile2, $dx, $dy) = @$_;
1414
1415 next if $block & (1 << $tile);
1416 my $block = $block | (1 << $tile2);
1417
1418 my $gx = $gx + $dx;
1419 my $gy = $gy + $dy;
1420
1421 next unless $flags & (1 << ($tile - 1));
1422 next if $self->{neigh_grid}{$gx, $gy}++;
1423
1424 my $neigh = $self->{neigh_map}{$hash} ||= [];
1425 if (my $info = $neigh->[$tile]) {
1426 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1427
1428 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1429 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1430
1431 } else {
1432 $self->send_mapinfo ("spatial $path$tile", sub {
1433 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1434
1435 return if $mode ne "spatial";
1436
1437 $x += $MAP->ox;
1438 $y += $MAP->oy;
1439
1440 $self->load_map ($hash, $x, $y)
1441 unless $self->{neigh_map}{$hash}[5]++;#d#
1442
1443 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1444
1445 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1446 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1447 });
1448 }
1449 }
1450}
1451
1452sub conn::map_change {
1453 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1454
1455 $self->flush_map;
1456
1457 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1458
1459 my $mapmapw = $MAPMAP->{w};
1460 my $mapmaph = $MAPMAP->{h};
1461
1462 $self->{neigh_rect} = [
1463 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1464 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1465 ];
1466
1467 delete $self->{neigh_grid};
1468
1469 $x += $ox;
1470 $y += $oy;
1471
1472 $self->{map_info} = [$hash, $x, $y, $w, $h];
1473
1474 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1475 $STATWIDS->{map}->set_text ("Map: " . $map);
1476
1477 $self->load_map ($hash, $x, $y);
1478 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1479}
1480
1481sub conn::face_find {
1482 my ($self, $facenum, $face) = @_;
1483
1484 my $hash = "$face->{chksum},$face->{name}";
1485
1486 my $id = $FACEMAP->get ($hash);
1487
1488 unless ($id) {
1489 # create new id for face
1490 # I love transactions
1491 for (1..100) {
1492 my $txn = $CFClient::DB_ENV->txn_begin;
1493 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1494 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1495 $id = ($id || 16) + 1;
1496 if ($FACEMAP->put (id => $id) == 0
1497 && $FACEMAP->put ($hash => $id) == 0) {
1498 $txn->txn_commit;
1499
1500 goto gotid;
1501 }
1502 }
1503 $txn->abort;
1504 }
1505
1506 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1507 }
1508
1509gotid:
1510 $face->{id} = $id;
1511 $MAP->set_face ($facenum => $id);
1512 $self->{faceid}[$facenum] = $id;#d#
1513
1514 my $face = $TILECACHE->get ($id);
1515
1516 if ($face) {
1517 #$self->face_prefetch;
1518 $face
1519 } else {
1520 my $tex = $self->{noface};
1521 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1522 undef
1523 };
1524}
1525
1526sub conn::face_update {
1527 my ($self, $facenum, $face) = @_;
1528
1529 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1530
1531 $self->set_texture ($face->{id} => delete $face->{image});
1532}
1533
1534sub conn::set_texture {
1535 my ($self, $id, $data) = @_;
1536
1537 $self->{texture}[$id] ||= do {
1538 my $tex =
1539 new_from_image CFClient::Texture
1540 $data, minify => 1, mipmap => 1;
1541
1542 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1543 $MAPWIDGET->update;
1544
1545 $tex
1546 };
1547}
1548
1549sub conn::sound_play {
1550 my ($self, $x, $y, $soundnum, $type) = @_;
1551
1552 $SDL_MIXER
1553 or return;
1554
1555 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1556 or return;
1557
1558 $chunk->play;
1559# warn "sound $x,$y,$soundnum,$type\n";#d#
1560}
1561
1562my $LAST_QUERY; # server is stupid, stupid, stupid
1563
1564sub conn::query {
1565 my ($self, $flags, $prompt) = @_;
1566
1567 $prompt = $LAST_QUERY unless length $prompt;
1568 $LAST_QUERY = $prompt;
1569
1570 my $dialog = new CFClient::UI::FancyFrame
1571 title => "Query",
1572 child => my $vbox = new CFClient::UI::VBox;
1573
1574 $vbox->add (new CFClient::UI::Label
1575 max_w => $::WIDTH * 0.4,
1576 ellipsise => 0,
1577 text => $prompt);
1578
1579 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1580 $vbox->add (my $hbox = new CFClient::HBox);
1581 $hbox->add (new CFClient::Button
1582 text => "No",
1583 connect_activate => sub {
1584 $self->send ("reply n");
1585 $dialog->destroy;
1586 $MAPWIDGET->focus_in;
1587 }
1588 );
1589 $hbox->add (new CFClient::Button
1590 text => "Yes",
1591 connect_activate => sub {
1592 $self->send ("reply y");
1593 $dialog->destroy;
1594 },
1595 );
1596
1597 $dialog->focus_in;
1598
1599 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1600 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1601 $vbox->add (my $entry = new CFClient::UI::Entry
1602 connect_changed => sub {
1603 $self->send ("reply $_[1]");
1604 $dialog->destroy;
1605 },
1606 );
1607
1608 $entry->focus_in;
1609
1610 } else {
1611 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1612
1613 $vbox->add (my $entry = new CFClient::UI::Entry
1614 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1615 connect_activate => sub {
1616 $self->send ("reply $_[1]");
1617 $dialog->destroy;
1618 },
1619 );
1620
1621 $entry->focus_in;
1622 }
1623
1624 $dialog->show_centered;
1625}
1626
1627sub conn::drawinfo {
1628 my ($self, $color, $text) = @_;
1629
1630 my @color = (
1631 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1632 [1.00, 1.00, 1.00],
1633 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1634 [1.00, 0.00, 0.00],
1635 [1.00, 0.54, 0.00],
1636 [0.11, 0.56, 1.00],
1637 [0.93, 0.46, 0.00],
1638 [0.18, 0.54, 0.34],
1639 [0.56, 0.73, 0.56],
1640 [0.80, 0.80, 0.80],
1641 [0.55, 0.41, 0.13],
1642 [0.99, 0.77, 0.26],
1643 [0.74, 0.65, 0.41],
1644 );
1645
1646 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1647
1648 $text = CFClient::UI::Label::escape $text;
1649 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1650 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1651
1652 $LOGVIEW->add_paragraph ($color[$color],
1653 join "\n", map "$time $_", split /\n/, $text);
1654
1655 $STATUSBOX->add ($text,
1656 group => $text,
1657 fg => $color[$color],
1658 timeout => 10,
1659 tooltip_font => $::FONT_FIXED,
1660 );
1661}
1662
1663sub conn::drawextinfo {
1664 my ($self, $color, $type, $subtype, $message) = @_;
1665
1666 $self->drawinfo ($color, $message);
1667}
1668
1669sub conn::spell_add {
1670 my ($self, $spell) = @_;
1671
1672 # TODO
1673 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1674 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1675 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1676}
1677
1678sub conn::spell_delete {
1679 my ($self, $spell) = @_;
1680}
1681
1682sub conn::addme_success {
1683 my ($self) = @_;
1684
1685 $self->send ("command output-sync $CFG->{output_sync}");
1686 $self->send ("command output-count $CFG->{output_count}");
1687
1688 my $parser = new Pod::POM;
1689 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1690
1691 my %skill_tooltip;
1692
1693 for my $head2 ($pod->head1->[-2]->head2) {
1694 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1695 }
1696
1697 for my $skill (values %{$self->{skill_info}}) {
1698 $MAPWIDGET->add_command ("ready_skill $skill",
1699 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1700 . $skill_tooltip{$skill});
1701 $MAPWIDGET->add_command ("use_skill $skill",
1702 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1703 . $skill_tooltip{$skill});
1704 }
1705}
1706
1707sub conn::eof {
1708 $MAPWIDGET->clr_commands;
1709
1710 stop_game;
1711}
1712
1713sub conn::image_info {
1714 my ($self, $numfaces) = @_;
1715
1716 $self->{num_faces} = $numfaces;
1717 $self->{face_prefetch} = [1 .. $numfaces];
1718 $self->face_prefetch;
1719}
1720
1721sub conn::face_prefetch {
1722 my ($self) = @_;
1723
1724 return unless $CFG->{face_prefetch};
1725
1726 if ($self->{num_faces}) {
1727 return if @{ $self->{send_queue} || [] };
1728 my $todo = @{ $self->{face_prefetch} }
1729 or return;
1730
1731 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1732
1733 $self->send ("requestinfo image_sums $face $face");
1734
1735 $STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1736 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1737 } elsif (!exists $self->{num_faces}) {
1738 $self->send ("requestinfo image_info");
1739
1740 $self->{num_faces} = 0;
1741
1742 $STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1743 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1744 }
1745}
1746
1747# check once/second for faces that need to be prefetched 1507# check once/second for faces that need to be prefetched
1748# this should, of course, only run on demand, but 1508# this should, of course, only run on demand, but
1749# SDL forces worse things on us.... 1509# SDL forces worse things on us....
1750 1510
1751Event->timer (after => 1, interval => 0.25, cb => sub { 1511Event->timer (after => 1, interval => 0.25, cb => sub {
1752 $CONN->face_prefetch 1512 $CONN->face_prefetch
1753 if $CONN; 1513 if $CONN;
1754}); 1514});
1755
1756sub update_floorbox {
1757 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1758 return unless $CONN;
1759
1760 $FLOORBOX->clear;
1761
1762 my $row;
1763 for (@{ $CONN->{container}{0} }) {
1764 if ($row < 7) {
1765 local $_->{face_widget}; # hack to force recreation of widget
1766 local $_->{desc_widget}; # hack to force recreation of widget
1767 CFClient::Item::update_widgets $_;
1768
1769 $FLOORBOX->add (0, $row, $_->{face_widget});
1770 $FLOORBOX->add (1, $row, $_->{desc_widget});
1771
1772 $row++;
1773 } else {
1774 $FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");
1775 last;
1776 }
1777 }
1778 });
1779
1780 $WANT_REFRESH++;
1781}
1782
1783sub set_opencont {
1784 my ($conn, $tag, $name) = @_;
1785 $conn->{open_container} = $tag;
1786 $INVR_LBL->set_text ($name);
1787 $INVR->set_items ($conn->{container}{$tag});
1788}
1789
1790sub update_container {
1791 my ($tag) = @_;
1792 $INVR->set_items ($::CONN->{container}{$CONN->{open_container}})
1793 if $tag == $CONN->{open_container};
1794}
1795
1796sub conn::container_add {
1797 my ($self, $tag, $items) = @_;
1798
1799 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1800
1801 if ($tag == 0) {
1802 update_floorbox;
1803 update_container (0);
1804 } elsif ($tag == $self->{player}{tag}) {
1805 $INV->set_items ($self->{container}{$self->{player}{tag}})
1806 } else {
1807 update_container ($tag);
1808 }
1809
1810 # $self-<{player}{tag} => player inv
1811 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1812}
1813
1814sub conn::container_clear {
1815 my ($self, $tag) = @_;
1816
1817 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1818
1819 if ($tag == 0) {
1820 update_floorbox;
1821 update_container (0);
1822 } elsif ($tag == $self->{player}{tag}) {
1823 $INV->set_items ($self->{container}{$tag})
1824 }
1825
1826# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1827}
1828
1829sub conn::item_delete {
1830 my ($self, @items) = @_;
1831
1832 for (@items) {
1833 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1834
1835 if ($_->{container} == 0) {
1836 update_floorbox;
1837 update_container ($_->{tag});
1838 } elsif ($_->{container} == $self->{player}{tag}) {
1839 $INV->set_items ($self->{container}{$self->{player}{tag}})
1840 } else {
1841 update_container ($_->{tag});
1842 }
1843 }
1844}
1845
1846sub conn::item_update {
1847 my ($self, $item) = @_;
1848
1849 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($CONN->{open_container})\n";
1850
1851 if ($item->{tag} == $self->{player}{tag}) {
1852 $STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
1853 return
1854 }
1855
1856 CFClient::Item::update_widgets $item;
1857
1858 if ($item->{tag} == $CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1859 set_opencont ($CONN, 0, "Floor");
1860
1861 } elsif ($item->{flags} & Crossfire::Protocol::F_OPEN) {
1862 set_opencont ($CONN, $item->{tag}, CFClient::Item::desc_string $item);
1863 } else {
1864 if ($item->{container} == 0) {
1865 update_floorbox;
1866 update_container (0);
1867 } elsif ($item->{container} == $self->{player}{tag}) {
1868 $INV->set_items ($self->{container}{$item->{container}})
1869 }
1870 }
1871}
1872 1515
1873%SDL_CB = ( 1516%SDL_CB = (
1874 CFClient::SDL_QUIT => sub { 1517 CFClient::SDL_QUIT => sub {
1875 Event::unloop -1; 1518 Event::unloop -1;
1876 }, 1519 },
… …
1908############################################################################# 1551#############################################################################
1909 1552
1910$SIG{INT} = $SIG{TERM} = sub { exit }; 1553$SIG{INT} = $SIG{TERM} = sub { exit };
1911 1554
1912{ 1555{
1913 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1556 local $SIG{__DIE__} = sub {
1557 return unless defined $^S && !$^S;
1558 Carp::confess $_[1];#d#TODO: remove when stable
1559 CFClient::fatal $_[0];
1560 };
1914 1561
1915 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1562 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1916 1563 CFClient::UI::set_layout ($::CFG->{layout});
1917 $TILECACHE = CFClient::db_table "tilecache";
1918 $FACEMAP = CFClient::db_table "facemap";
1919 1564
1920 my %DEF_CFG = ( 1565 my %DEF_CFG = (
1921 sdl_mode => 0, 1566 sdl_mode => 0,
1922 width => 640, 1567 width => 640,
1923 height => 480, 1568 height => 480,
… …
2000 1645
2001END { CFClient::SDL_Quit } 1646END { CFClient::SDL_Quit }
2002 1647
2003=head1 NAME 1648=head1 NAME
2004 1649
2005pclient - A Crossfire+ and Crossfire game client 1650cfplus - A Crossfire+ and Crossfire game client
2006 1651
2007=head1 SYNOPSIS 1652=head1 SYNOPSIS
2008 1653
2009Just run it - no commandline arguments are supported. 1654Just run it - no commandline arguments are supported.
2010 1655
2011=head1 USAGE 1656=head1 USAGE
2012 1657
2013Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1658cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
2014fullscreen and interactively. 1659fullscreen and interactively.
2015 1660
1661=head1 DEBUGGING
1662
1663
1664CFPLUS_DEBUG - environment variable
1665
1666 1 draw borders around widgets
1667 2 add low-level widget info to tooltips
1668 4 show fps
1669 8 suppress tooltips
1670
2016=head1 AUTHOR 1671=head1 AUTHOR
2017 1672
2018Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1673Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2019 1674
2020 1675

Diff Legend

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