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.54 by root, Mon Jun 5 01:59:59 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 ();
40use CFClient::Protocol;
39use CFClient::UI; 41use CFClient::UI;
40use CFClient::MapWidget; 42use CFClient::MapWidget;
41 43
42$Event::DIED = sub { 44$Event::DIED = sub {
43 # TODO: display dialog box or so 45 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable
44 CFClient::error $_[1]; 47 CFClient::error $_[1];
45}; 48};
46 49
47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 50#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
48 51
50 53
51my $MAX_FPS = 60; 54my $MAX_FPS = 60;
52my $MIN_FPS = 5; # unused as of yet 55my $MIN_FPS = 5; # unused as of yet
53 56
54our $META_SERVER = "crossfire.real-time.com:13326"; 57our $META_SERVER = "crossfire.real-time.com:13326";
55
56our $FACEMAP;
57our $TILECACHE;
58our $MAPCACHE;
59 58
60our $LAST_REFRESH; 59our $LAST_REFRESH;
61our $NOW; 60our $NOW;
62 61
63our $CFG; 62our $CFG;
83our $LOGVIEW; 82our $LOGVIEW;
84our $CONSOLE; 83our $CONSOLE;
85our $METASERVER; 84our $METASERVER;
86our $LOGIN_BUTTON; 85our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 86our $QUIT_DIALOG;
87our $HOST_ENTRY;
88
89our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK;
91our $SETUP_SERVER;
92our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
88 94
89our $FLOORBOX; 95our $FLOORBOX;
90our $GAUGES; 96our $GAUGES;
91our $STATWIDS; 97our $STATWIDS;
92 98
99 105
100our $ALT_ENTER_MESSAGE; 106our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 107our $STATUSBOX;
102our $DEBUG_STATUS; 108our $DEBUG_STATUS;
103 109
104our $INVWIN; 110our $INV_WINDOW;
105our $INV; 111our $INV;
106our $INVR; 112our $INVR;
107our $INVR_LBL; 113our $INV_RIGHT_HB;
114
115our $BIND_EDITOR;
116
117our $PICKUP_CFG;
108 118
109sub status { 119sub status {
110 $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]);
111} 121}
112 122
113sub debug { 123sub debug {
114 $DEBUG_STATUS->set_text ($_[0]); 124 $DEBUG_STATUS->set_text ($_[0]);
115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
117} 125}
118 126
119sub start_game { 127sub start_game {
120 status "logging in..."; 128 status "logging in...";
121 129
130 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide;
132
122 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;
123 134
124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 135 my ($host, $port) = split /:/, $CFG->{host};
136
125 $MAP = new CFClient::Map $mapsize, $mapsize; 137 $MAP = new CFClient::Map $mapsize, $mapsize;
126
127 my ($host, $port) = split /:/, $CFG->{host};
128 138
129 $CONN = eval { 139 $CONN = eval {
130 new conn 140 new CFClient::Protocol
131 host => $host, 141 host => $host,
132 port => $port || 13327, 142 port => $port || 13327,
133 user => $CFG->{user}, 143 user => $CFG->{user},
134 pass => $CFG->{password}, 144 pass => $CFG->{password},
135 mapw => $mapsize, 145 mapw => $mapsize,
136 maph => $mapsize, 146 maph => $mapsize,
137 ; 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 },
138 }; 165 };
139 166
140 if ($CONN) { 167 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh}; 168 CFClient::lowdelay fileno $CONN->{fh};
142 169
143 $LOGIN_BUTTON->set_text ("Logout");
144 status "login successful"; 170 status "login successful";
145
146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
149 } else { 171 } else {
150 status "unable to connect"; 172 status "unable to connect";
151 stop_game(); 173 stop_game();
152 } 174 }
153} 175}
154 176
155sub stop_game { 177sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login");
179 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
180 $SETUP_DIALOG->show;
181 $INV_WINDOW->hide;
182
156 return unless $CONN; 183 return unless $CONN;
157 184
158 status "connection closed"; 185 status "connection closed";
159 $LOGIN_BUTTON->set_text ("Login"); 186
160 $CONN->destroy; 187 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify 188 $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} 189}
169 190
170sub client_setup { 191sub graphics_setup {
171 my $dialog = new CFClient::UI::FancyFrame
172 title => "Client Setup",
173 child => (my $vbox = new CFClient::UI::VBox); 192 my $vbox = new CFClient::UI::VBox;
193
174 $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]);
175 195
176 $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");
177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
178 198
179 $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]);
180 $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");
181 201
182 $mode_slider->connect (changed => sub { 202 $mode_slider->connect (changed => sub {
183 my ($self, $value) = @_; 203 my ($self, $value) = @_;
184 204
191 211
192 $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");
193 $table->add (1, $row++, new CFClient::UI::CheckBox 213 $table->add (1, $row++, new CFClient::UI::CheckBox
194 state => $CFG->{fullscreen}, 214 state => $CFG->{fullscreen},
195 tooltip => "Bring the client into fullscreen mode.", 215 tooltip => "Bring the client into fullscreen mode.",
196 connect_changed => sub { 216 on_changed => sub {
197 my ($self, $value) = @_; 217 my ($self, $value) = @_;
198 $CFG->{fullscreen} = $value; 218 $CFG->{fullscreen} = $value;
199 } 219 }
200 ); 220 );
201 221
202 $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");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fast}, 224 state => $CFG->{fast},
205 tooltip => "Lower the visual quality considerably to speed up rendering.", 225 tooltip => "Lower the visual quality considerably to speed up rendering.",
206 connect_changed => sub { 226 on_changed => sub {
207 my ($self, $value) = @_; 227 my ($self, $value) = @_;
208 $CFG->{fast} = $value; 228 $CFG->{fast} = $value;
209 } 229 }
210 ); 230 );
211 231
212 $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");
213 $table->add (1, $row++, new CFClient::UI::Slider 233 $table->add (1, $row++, new CFClient::UI::Slider
214 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
215 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
216 connect_changed => sub { 236 on_changed => sub {
217 my ($self, $value) = @_; 237 my ($self, $value) = @_;
218 $CFG->{map_scale} = 2 ** $value; 238 $CFG->{map_scale} = 2 ** $value;
219 } 239 }
220 ); 240 );
221 241
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 243 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fow_enable}, 244 state => $CFG->{fow_enable},
225 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.",
226 connect_changed => sub { 246 on_changed => sub {
227 my ($self, $value) = @_; 247 my ($self, $value) = @_;
228 $CFG->{fow_enable} = $value; 248 $CFG->{fow_enable} = $value;
229 } 249 }
230 ); 250 );
231 251
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 253 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 254 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.", 255 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 { 256 on_changed => sub {
237 my ($self, $value) = @_; 257 my ($self, $value) = @_;
238 $CFG->{fow_intensity} = $value; 258 $CFG->{fow_intensity} = $value;
239 } 259 }
240 ); 260 );
241 261
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 263 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_smooth}, 264 state => $CFG->{fow_smooth},
245 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.",
246 connect_changed => sub { 266 on_changed => sub {
247 my ($self, $value) = @_; 267 my ($self, $value) = @_;
248 $CFG->{fow_smooth} = $value; 268 $CFG->{fow_smooth} = $value;
249 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;
250 } 270 }
251 ); 271 );
252 272
253 $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");
254 $table->add (1, $row++, new CFClient::UI::Slider 274 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 275 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.", 276 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] }, 277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
258 ); 278 );
259 279
260 $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");
261 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 282 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.", 283 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]) }, 284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
265 ); 285 );
266 286
267 $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");
268 288
269 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 290 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.", 291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
272 connect_changed => sub { 292 on_changed => sub {
273 $CFG->{stat_fontsize} = $_[1]; 293 $CFG->{stat_fontsize} = $_[1];
274 &set_stats_window_fontsize; 294 &set_stats_window_fontsize;
275 } 295 }
276 ); 296 );
277 297
278 $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");
279 $table->add (1, $row++, new CFClient::UI::Slider 299 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 300 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.", 301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
282 connect_changed => sub { 302 on_changed => sub {
283 $CFG->{gauge_fontsize} = $_[1]; 303 $CFG->{gauge_fontsize} = $_[1];
284 &set_gauge_window_fontsize; 304 &set_gauge_window_fontsize;
285 } 305 }
286 ); 306 );
287 307
288 $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");
289 $table->add (1, $row++, new CFClient::UI::Slider 309 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_size}, 0.2, 0.8], 310 range => [$CFG->{gauge_size}, 0.2, 0.8],
291 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.",
292 connect_changed => sub { 312 on_changed => sub {
293 $CFG->{gauge_size} = $_[1]; 313 $CFG->{gauge_size} = $_[1];
294 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
295 } 315 }
296 ); 316 );
297 317
298 $table->add (1, $row++, new CFClient::UI::Button 318 $table->add (1, $row++, new CFClient::UI::Button
299 expand => 1, align => 0, text => "Apply", 319 expand => 1, align => 0, text => "Apply",
300 tooltip => "Apply the video settings", 320 tooltip => "Apply the video settings",
301 connect_activate => sub { 321 on_activate => sub {
302 video_shutdown (); 322 video_shutdown ();
303 video_init (); 323 video_init ();
304 } 324 }
305 ); 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;
306 336
307 $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");
308 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
309 state => $CFG->{audio_enable}, 339 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.", 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.",
311 connect_changed => sub { 341 on_changed => sub {
312 $CFG->{audio_enable} = $_[1]; 342 $CFG->{audio_enable} = $_[1];
313 } 343 }
314 ); 344 );
315# $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");
316# $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 {
317# $CFG->{effects_volume} = $_[1]; 347# $CFG->{effects_volume} = $_[1];
318# }); 348# });
319 $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");
320 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 350 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
321 $hbox->add (new CFClient::UI::CheckBox 351 $hbox->add (new CFClient::UI::CheckBox
322 expand => 1, state => $CFG->{bgm_enable}, 352 expand => 1, state => $CFG->{bgm_enable},
323 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.",
324 connect_changed => sub { 354 on_changed => sub {
325 $CFG->{bgm_enable} = $_[1]; 355 $CFG->{bgm_enable} = $_[1];
326 } 356 }
327 ); 357 );
328 $hbox->add (new CFClient::UI::Slider 358 $hbox->add (new CFClient::UI::Slider
329 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 359 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
330 tooltip => "The volume of the background music. Changes are instant.", 360 tooltip => "The volume of the background music. Changes are instant.",
331 connect_changed => sub { 361 on_changed => sub {
332 $CFG->{bgm_volume} = $_[1]; 362 $CFG->{bgm_volume} = $_[1];
333 CFClient::MixMusic::volume $_[1] * 128; 363 CFClient::MixMusic::volume $_[1] * 128;
334 } 364 }
335 ); 365 );
336 366
337 $table->add (1, $row++, new CFClient::UI::Button 367 $table->add (1, $row++, new CFClient::UI::Button
338 expand => 1, align => 0, text => "Apply", 368 expand => 1, align => 0, text => "Apply",
339 tooltip => "Apply the audio settings", 369 tooltip => "Apply the audio settings",
340 connect_activate => sub { 370 on_activate => sub {
341 audio_shutdown (); 371 audio_shutdown ();
342 audio_init (); 372 audio_init ();
343 } 373 }
344 ); 374 );
345 375
346 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $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} 377}
360 378
361sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
362 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
363 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
372 390
373sub make_gauge_window { 391sub make_gauge_window {
374 my $gh = int $HEIGHT * $CFG->{gauge_size}; 392 my $gh = int $HEIGHT * $CFG->{gauge_size};
375 393
376 my $win = new CFClient::UI::Frame ( 394 my $win = new CFClient::UI::Frame (
377 req_y => -1, 395 force_x => 0,
396 force_y => "max",
378 user_w => $WIDTH, 397 force_w => $WIDTH,
379 user_h => $gh, 398 force_h => $gh,
380 ); 399 );
381 400
382 $win->add (my $hbox = new CFClient::UI::HBox 401 $win->add (my $hbox = new CFClient::UI::HBox
383 children => [ 402 children => [
384 (new CFClient::UI::HBox expand => 1), 403 (new CFClient::UI::HBox expand => 1),
420 &set_gauge_window_fontsize; 439 &set_gauge_window_fontsize;
421 440
422 $win 441 $win
423} 442}
424 443
444
425sub make_stats_window { 445sub make_stats_window {
426 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";
427 451
428 $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);
429 $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,
430 can_hover => 1, can_events => 1, 454 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."); 455 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)."); 458 tooltip => "The map you are currently on (if supported by the server).");
435 459
436 $vb->add (my $hb0 = new CFClient::UI::HBox); 460 $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, 461 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
438 can_hover => 1, can_events => 1, 462 can_hover => 1, can_events => 1,
439 tooltip => "This is the amount the Player weights."); 463 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, 464 $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, 465 can_hover => 1, can_events => 1,
442 tooltip => "The weight limit, you can't carry more than this."); 466 tooltip => "The weight limit: you cannot carry more than this.");
443 467
444 468
445 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 469 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
446 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 470 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
447 471
530 update_stats_window ({}); 554 update_stats_window ({});
531 555
532 $tgw 556 $tgw
533} 557}
534 558
535sub formsep { 559sub formsep($) {
536 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
537} 561}
538 562
539sub update_stats_window { 563sub update_stats_window {
540 my ($stats) = @_; 564 my ($stats) = @_;
541 565
542 # i love text protocols!!! 566 # I love text protocols...
567
543 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 568 my $hp = $stats->{+CS_STAT_HP} * 1;
544 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 569 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
545 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 570 my $sp = $stats->{+CS_STAT_SP} * 1;
546 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 571 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
547 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 572 my $fo = $stats->{+CS_STAT_FOOD} * 1;
548 my $fo_m = 999; 573 my $fo_m = 999;
549 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 574 my $gr = $stats->{+CS_STAT_GRACE} * 1;
550 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 575 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
551 576
552 $GAUGES->{hp} ->set_value ($hp, $hp_m); 577 $GAUGES->{hp} ->set_value ($hp, $hp_m);
553 $GAUGES->{mana} ->set_value ($sp, $sp_m); 578 $GAUGES->{mana} ->set_value ($sp, $sp_m);
554 $GAUGES->{food} ->set_value ($fo, $fo_m); 579 $GAUGES->{food} ->set_value ($fo, $fo_m);
555 $GAUGES->{grace} ->set_value ($gr, $gr_m); 580 $GAUGES->{grace} ->set_value ($gr, $gr_m);
556 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 581 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
557 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 582 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
558 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 583 my $rng = $stats->{+CS_STAT_RANGE};
559 $rng =~ s/^Range: //; # thank you so much dear server 584 $rng =~ s/^Range: //; # thank you so much dear server
560 $GAUGES->{range} ->set_text ("Rng: " . $rng); 585 $GAUGES->{range} ->set_text ("Rng: " . $rng);
561 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 586 my $title = $stats->{+CS_STAT_TITLE};
562 $title =~ s/^Player: //; 587 $title =~ s/^Player: //;
563 $STATWIDS->{title} ->set_text ("Title: " . $title); 588 $STATWIDS->{title} ->set_text ("Title: " . $title);
564 589
565 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 590 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
566 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 591 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
567 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 592 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
568 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 593 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
569 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 594 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
570 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 595 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
571 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 596 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
572 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 597 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
573 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 598 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
574 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 599 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
575 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 600 $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}); 601 $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}); 602 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
578 603
579 $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);
580 605
606 # TODO: replace by CS_STAT_RES_xxx constants
581 my %tbl = ( 607 my %tbl = (
582 phys => 100, 608 phys => 100,
583 magic => 101, 609 magic => 101,
584 fire => 102, 610 fire => 102,
585 elec => 103, 611 elec => 103,
594 tund => 112, 620 tund => 112,
595 fear => 113, 621 fear => 113,
596 depl => 113, 622 depl => 113,
597 deat => 115, 623 deat => 115,
598 holyw => 116, 624 holyw => 116,
599 blind => 117 625 blind => 117,
600 ); 626 );
601 627
602 for (keys %tbl) {
603 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
604 } 629 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} 630}
617 631
618my $METASERVER_ATIME; 632my $METASERVER_ATIME;
619 633
620sub update_metaserver { 634sub update_metaserver {
621 my ($HOST) = @_;
622
623 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
624 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
625 637
626 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
627 $table->clear; 639 $table->clear;
678 $m = [$users, $host, $uptime, $version, $desc]; 690 $m = [$users, $host, $uptime, $version, $desc];
679 691
680 $y++; 692 $y++;
681 693
682 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
683 (new CFClient::UI::Button text => "Use", connect_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
684 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
685 }), 698 }),
686 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
687 ]); 700 ]);
688 701
689 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
692 } 705 }
693 } 706 }
694 }); 707 });
695} 708}
696 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
697sub server_setup { 727sub server_setup {
698 my $dialog = new CFClient::UI::FancyFrame
699 title => "Server Setup",
700 child => (my $vbox = new CFClient::UI::VBox); 728 my $vbox = new CFClient::UI::VBox;
701 729
702 $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]);
703 $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");
704 732
705 { 733 {
706 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
707 735
708 $vbox->add ( 736 $vbox->add (
709 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
710 expand => 1, 738 expand => 1,
711 text => $CFG->{host}, 739 text => $CFG->{host},
712 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",
713 connect_changed => sub { 741 on_changed => sub {
714 my ($self, $value) = @_; 742 my ($self, $value) = @_;
715 $CFG->{host} = $value; 743 $CFG->{host} = $value;
716 } 744 }
717 ); 745 );
718 746
719 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
720 748
721 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
722 expand => 1, 750 expand => 1,
723 text => "Server List", 751 text => "Server List",
724 other => $METASERVER, 752 other => $METASERVER,
725 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
726 connect_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
727 update_metaserver $HOST;
728 }
729 ); 755 );
730 } 756 }
731 757
732 $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");
733 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
734 text => $CFG->{user}, 760 text => $CFG->{user},
735 tooltip => "The name of your character on the server", 761 tooltip => "The name of your character on the server",
736 connect_changed => sub { 762 on_changed => sub {
737 my ($self, $value) = @_; 763 my ($self, $value) = @_;
738 $CFG->{user} = $value; 764 $CFG->{user} = $value;
739 } 765 }
740 ); 766 );
741 767
742 $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");
743 $table->add (1, 5, new CFClient::UI::Entry 769 $table->add (1, 5, new CFClient::UI::Entry
744 text => $CFG->{password}, 770 text => $CFG->{password},
745 hidden => 1, 771 hidden => 1,
746 tooltip => "The password for your character", 772 tooltip => "The password for your character",
747 connect_changed => sub { 773 on_changed => sub {
748 my ($self, $value) = @_; 774 my ($self, $value) = @_;
749 $CFG->{password} = $value; 775 $CFG->{password} = $value;
750 } 776 }
751 ); 777 );
752 778
753 $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");
754 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
755 req_w => 100, 781 force_w => 100,
756 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
757 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. "
758 . "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, "
759 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
760 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
761 connect_changed => sub { 787 on_changed => sub {
762 my ($self, $value) = @_; 788 my ($self, $value) = @_;
763 789
764 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
765 }, 791 },
766 ); 792 );
773 . "This might increase or create lag, but increases the chances " 799 . "This might increase or create lag, but increases the chances "
774 . "of faces being ready for display when you encounter them. " 800 . "of faces being ready for display when you encounter them. "
775 . "It also uses up server bandwidth on every connect, " 801 . "It also uses up server bandwidth on every connect, "
776 . "so only set it if you really need to prefetch images. " 802 . "so only set it if you really need to prefetch images. "
777 . "This option can be set and unset any time.", 803 . "This option can be set and unset any time.",
778 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 804 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
779 ); 805 );
780 806
781 $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");
782 $table->add (1, 9, new CFClient::UI::Entry 808 $table->add (1, 9, new CFClient::UI::Entry
783 text => $CFG->{output_count}, 809 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.", 810 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] }, 811 on_changed => sub { $CFG->{output_count} = $_[1] },
786 ); 812 );
787 813
788 $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");
789 $table->add (1, 10, new CFClient::UI::Entry 815 $table->add (1, 10, new CFClient::UI::Entry
790 text => $CFG->{output_sync}, 816 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.", 817 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] }, 818 on_changed => sub { $CFG->{output_sync} = $_[1] },
793 ); 819 );
794 820
795 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
796 expand => 1, 822 expand => 1,
797 align => 0, 823 align => 0,
798 text => "Login", 824 text => "Login",
799 connect_activate => sub { 825 on_activate => sub {
800 $CONN ? stop_game 826 $CONN ? stop_game
801 : start_game; 827 : start_game;
802 }, 828 },
803 ); 829 );
804 830
805 $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
806} 844}
807 845
808sub message_window { 846sub message_window {
809 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
848 name => "message_window",
810 title => "Messages", 849 title => "Messages",
811 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
812 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
852 x => "max",
853 y => 0,
813 user_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
814 user_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
815 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
816 857
817 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
818 859
819 $vbox->add (my $input = new CFClient::UI::Entry 860 $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> " 861 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>...). " 862 . "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). " 863 . "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.", 864 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
824 connect_focus_in => sub { 865 on_focus_in => sub {
825 my ($input, $prev_focus) = @_; 866 my ($input, $prev_focus) = @_;
826 867
827 delete $input->{refocus_map}; 868 delete $input->{refocus_map};
828 869
829 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
830 $input->{refocus_map} = 1; 871 $input->{refocus_map} = 1;
831 } 872 }
832 delete $input->{auto_activated}; 873 delete $input->{auto_activated};
833 }, 874 },
834 connect_activate => sub { 875 on_activate => sub {
835 my ($input, $text) = @_; 876 my ($input, $text) = @_;
836 $input->set_text (''); 877 $input->set_text ('');
837 878
838 if ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
839 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
844 if ($input->{refocus_map}) { 885 if ($input->{refocus_map}) {
845 delete $input->{refocus_map}; 886 delete $input->{refocus_map};
846 $MAPWIDGET->focus_in 887 $MAPWIDGET->focus_in
847 } 888 }
848 }, 889 },
849 connect_escape => sub { 890 on_escape => sub {
850 $MAPWIDGET->focus_in 891 $MAPWIDGET->focus_in
851 }, 892 },
852 ); 893 );
853 894
854 $CONSOLE = { 895 $CONSOLE = {
855 window => $window, 896 window => $window,
856 input => $input 897 input => $input,
857 }; 898 };
858 899
859 $window 900 $window
860} 901}
861 902
862sub open_quit_dialog { 903sub open_quit_dialog {
863 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
864
865 $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 ;
866 910
867 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
868 912
869 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
870 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
873 ); 917 );
874 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
875 $hb->add (new CFClient::UI::Button 919 $hb->add (new CFClient::UI::Button
876 text => "Ok", 920 text => "Ok",
877 expand => 1, 921 expand => 1,
878 connect_activate => sub { $QUIT_DIALOG->hide }, 922 on_activate => sub { $QUIT_DIALOG->hide },
879 ); 923 );
880 $hb->add (new CFClient::UI::Button 924 $hb->add (new CFClient::UI::Button
881 text => "Quit anyway", 925 text => "Quit anyway",
882 expand => 1, 926 expand => 1,
883 connect_activate => sub { exit }, 927 on_activate => sub { exit },
884 ); 928 );
929 }
885 930
886 $QUIT_DIALOG->show_centered; 931 $QUIT_DIALOG->show;
887 } else { 932}
888 $QUIT_DIALOG->show_centered; 933
934sub autopickup_setup {
935 my $table = new CFClient::UI::Table;
936
937 for (
938 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
943 ],
944 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW],
949 ],
950 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
957 ],
958
959 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
963 ],
964 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
974 ],
975 )
889 } 976 {
977 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979
980 for (@bits) {
981 ++$y;
982
983 my $mask = $_->[1];
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask,
987 on_changed => sub {
988 my ($box, $value) = @_;
989 if ($value) {
990 $::CFG->{pickup} |= $mask;
991 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
993 }
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
995 if defined $::CONN;
996 });
997 }
998 }
999
1000 $table
890} 1001}
891 1002
892sub make_inventory_window { 1003sub make_inventory_window {
893 my $invwin = new CFClient::UI::FancyFrame 1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
894 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1005 x => "center",
1006 y => "center",
1007 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10,
1009 title => "Inventory",
1010 ;
895 1011
896 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
897 1013
898 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1014 $hb->add (my $vb1 = new CFClient::UI::VBox);
899 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5); 1015 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
900 $lbl->set_text ("Player");
901 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1016 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
902 1017
903 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1018 $hb->add (my $vb2 = new CFClient::UI::VBox);
1019
904 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5); 1020 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
905 $INVR_LBL->set_text ("Floor"); 1021
906 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1022 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
907 1023
1024 # XXX: Call after $INVR = ... because set_opencont sets the items
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
908 $invwin 1027 $invwin
1028}
1029
1030sub spell_setup {
1031 new CFClient::UI::SpellList
1032}
1033
1034sub keyboard_setup {
1035 my $binding_list = new CFClient::UI::VBox;
1036
1037 my $refresh;
1038 $refresh = sub {
1039 $binding_list->clear ();
1040
1041 for my $mod (keys %{$::CFG->{bindings}}) {
1042 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1043 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1044 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045
1046 my $lbl = join "; ", @$cmds;
1047 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1048 $binding_list->add (my $hb = new CFClient::UI::HBox);
1049 $hb->add (new CFClient::UI::Button
1050 text => "delete",
1051 tooltip => "Deletes the binding",
1052 on_activate => sub {
1053 $binding_list->remove ($hb);
1054 delete $::CFG->{bindings}->{$mod}->{$sym};
1055 });
1056
1057 $hb->add (new CFClient::UI::Button
1058 text => "edit",
1059 tooltip => "Edits the binding",
1060 on_activate => sub {
1061 $::BIND_EDITOR->set_binding (
1062 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1063 sub {
1064 my ($nmod, $nsym, $ncmds) = @_;
1065 delete $::CFG->{bindings}->{$mod}->{$sym};
1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1067 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069 $SETUP_DIALOG->show;
1070 },
1071 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073 $SETUP_DIALOG->show;
1074 });
1075 $::BIND_EDITOR->show;
1076 $SETUP_DIALOG->hide;
1077 });
1078
1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081 }
1082 }
1083 };
1084
1085 my $vb = new CFClient::UI::VBox;
1086 $vb->add ($binding_list);
1087 $vb->add (my $hb = new CFClient::UI::HBox);
1088
1089 $hb->add (new CFClient::UI::Button
1090 text => "record new",
1091 expand => 1,
1092 tooltip => "This button opens the binding editor with an empty binding.",
1093 on_activate => sub {
1094 $::BIND_EDITOR->set_binding (undef, undef, [],
1095 sub {
1096 my ($mod, $sym, $cmds) = @_;
1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1098 $refresh->();
1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show;
1101 },
1102 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show;
1105 },
1106 );
1107 $SETUP_DIALOG->hide;
1108 $::BIND_EDITOR->show;
1109 },
1110 );
1111
1112 $hb->add (new CFClient::UI::Button
1113 text => "close",
1114 tooltip => "Closes the binding window",
1115 expand => 1,
1116 on_activate => sub {
1117 $SETUP_DIALOG->hide;
1118 }
1119 );
1120
1121 $refresh->();
1122
1123 $vb
909} 1124}
910 1125
911sub make_help_window { 1126sub make_help_window {
912 my $win = new CFClient::UI::FancyFrame 1127 my $win = new CFClient::UI::FancyFrame
913 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1128 x => 'center',
1129 y => 'center',
1130 name => 'doc_browser',
1131 force_w => int $WIDTH * 7/8,
1132 force_h => int $HEIGHT * 7/8,
1133 title => "Documentation";
914 1134
915 $win->add (my $vbox = new CFClient::UI::VBox); 1135 $win->add (my $vbox = new CFClient::UI::VBox);
916 1136
917 $vbox->add (my $buttons = new CFClient::UI::HBox); 1137 $vbox->add (my $buttons = new CFClient::UI::HBox);
918 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1138 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
925 ) { 1145 ) {
926 my ($pod, $label) = @$_; 1146 my ($pod, $label) = @$_;
927 1147
928 $buttons->add (new CFClient::UI::Button 1148 $buttons->add (new CFClient::UI::Button
929 text => $label, 1149 text => $label,
930 connect_activate => sub { 1150 on_activate => sub {
931 my $parser = new Pod::POM; 1151 my $parser = new Pod::POM;
932 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1152 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
933 1153
934 $viewer->clear; 1154 $viewer->clear;
935 1155
966 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1186 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
967 1187
968 $SDL_ACTIVE = 1; 1188 $SDL_ACTIVE = 1;
969 $LAST_REFRESH = time - 0.01; 1189 $LAST_REFRESH = time - 0.01;
970 1190
971 CFClient::gl_init; 1191 CFClient::OpenGL::init;
972 1192
973 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1193 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
974 1194
975 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1195 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
976 1196
979 if ($DEBUG_STATUS) { 1199 if ($DEBUG_STATUS) {
980 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1200 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
981 } else { 1201 } else {
982 # create the widgets 1202 # create the widgets
983 1203
984 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1204 $DEBUG_STATUS = new CFClient::UI::Label
1205 padding => 0,
1206 z => 100,
1207 force_x => "max",
1208 force_y => 0;
985 $DEBUG_STATUS->show; 1209 $DEBUG_STATUS->show;
986 1210
1211 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1212
987 $STATUSBOX = new CFClient::UI::Statusbox; 1213 $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]); 1214 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
989 1215
990 (new CFClient::UI::Frame 1216 (new CFClient::UI::Frame
991 bg => [0, 0, 0, 0.4], 1217 bg => [0, 0, 0, 0.4],
992 req_y => -1, 1218 force_x => 0,
1219 force_y => "max",
993 child => $STATUSBOX, 1220 child => $STATUSBOX,
994 )->show; 1221 )->show;
995 1222
996 CFClient::UI::FancyFrame->new ( 1223 CFClient::UI::FancyFrame->new (
1224 title => "Map",
1225 name => "mapmap",
1226 x => 0,
1227 y => $FONTSIZE + 8,
997 border_bg => [1, 1, 1, 192/255], 1228 border_bg => [1, 1, 1, 192/255],
998 bg => [1, 1, 1, 0], 1229 bg => [1, 1, 1, 0],
999 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1230 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.", 1231 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1001 ), 1232 ),
1024 can_hover => 1, 1255 can_hover => 1,
1025 can_events => 1, 1256 can_events => 1,
1026 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1257 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1027 ; 1258 ;
1028 1259
1260 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1261 title => "Setup",
1262 name => "setup_dialog",
1263 x => 'center',
1264 y => 'center',
1265 z => 2,
1266 force_w => $::WIDTH * 0.6,
1267 force_h => $::HEIGHT * 0.6,
1268 ;
1269
1270 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1271 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1272
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings."
1283 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1290
1029 $BUTTONBAR = new CFClient::UI::HBox; 1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1030 1292
1031 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1293 $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."); 1294 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, 1295
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, 1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1036 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1037 1298
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 1299 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 1300
1040 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1041 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1302 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, 1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1043 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1044 1306
1045 $BUTTONBAR->add (new CFClient::UI::Button 1307 $BUTTONBAR->add (new CFClient::UI::Button
1046 text => "Save Config", 1308 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.", 1309 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 { 1310 on_activate => sub {
1311 $::CFG->{layout} = CFClient::UI::get_layout;
1049 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1050 status "Configuration Saved"; 1313 status "Configuration Saved";
1051 }, 1314 },
1052 ); 1315 );
1053 1316
1054 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1055 tooltip => "View Documentation"); 1318 tooltip => "View Documentation");
1056 1319
1057 $BUTTONBAR->add (new CFClient::UI::Button 1320 $BUTTONBAR->add (new CFClient::UI::Button
1058 text => "Quit", 1321 text => "Quit",
1059 tooltip => "Terminates the program", 1322 tooltip => "Terminates the program",
1060 connect_activate => sub { 1323 on_activate => sub {
1061 if ($CONN) { 1324 if ($CONN) {
1062 open_quit_dialog; 1325 open_quit_dialog;
1063 } else { 1326 } else {
1064 exit; 1327 exit;
1065 } 1328 }
1066 }, 1329 },
1067 ); 1330 );
1068 1331
1069 $BUTTONBAR->show; 1332 $BUTTONBAR->show;
1333 $SETUP_DIALOG->show;
1334 }
1070 1335
1071 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1336 $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 }
1081} 1337}
1082 1338
1083sub video_shutdown { 1339sub video_shutdown {
1084 undef $SDL_ACTIVE; 1340 undef $SDL_ACTIVE;
1085} 1341}
1152 1408
1153my %demo;#d# 1409my %demo;#d#
1154 1410
1155sub force_refresh { 1411sub force_refresh {
1156 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1412 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1157 debug sprintf "%3.2f", $fps; 1413 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1158 1414
1159 $CFClient::UI::ROOT->draw; 1415 $CFClient::UI::ROOT->draw;
1160 1416
1161 $WANT_REFRESH = 0; 1417 $WANT_REFRESH = 0;
1162 $CAN_REFRESH = 0; 1418 $CAN_REFRESH = 0;
1217}; 1473};
1218 1474
1219 CFClient::SDL_GL_SwapBuffers; 1475 CFClient::SDL_GL_SwapBuffers;
1220} 1476}
1221 1477
1222my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1478my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1223 $NOW = time; 1479 $NOW = time;
1224 1480
1225 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1481 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1226 for CFClient::SDL_PollEvent; 1482 for CFClient::SDL_PollEvent;
1227 1483
1245sub animation_stop { 1501sub animation_stop {
1246 my ($widget) = @_; 1502 my ($widget) = @_;
1247 delete $animate_object{$widget}; 1503 delete $animate_object{$widget};
1248} 1504}
1249 1505
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 1506# check once/second for faces that need to be prefetched
1745# this should, of course, only run on demand, but 1507# this should, of course, only run on demand, but
1746# SDL forces worse things on us.... 1508# SDL forces worse things on us....
1747 1509
1748Event->timer (after => 1, interval => 0.25, cb => sub { 1510Event->timer (after => 1, interval => 0.25, cb => sub {
1749 $CONN->face_prefetch 1511 $CONN->face_prefetch
1750 if $CONN; 1512 if $CONN;
1751}); 1513});
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 1514
1867%SDL_CB = ( 1515%SDL_CB = (
1868 CFClient::SDL_QUIT => sub { 1516 CFClient::SDL_QUIT => sub {
1869 Event::unloop -1; 1517 Event::unloop -1;
1870 }, 1518 },
1902############################################################################# 1550#############################################################################
1903 1551
1904$SIG{INT} = $SIG{TERM} = sub { exit }; 1552$SIG{INT} = $SIG{TERM} = sub { exit };
1905 1553
1906{ 1554{
1907 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1555 local $SIG{__DIE__} = sub {
1556 return unless defined $^S && !$^S;
1557 Carp::confess $_[1];#d#TODO: remove when stable
1558 CFClient::fatal $_[0];
1559 };
1908 1560
1909 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1561 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1910 1562 CFClient::UI::set_layout ($::CFG->{layout});
1911 $TILECACHE = CFClient::db_table "tilecache";
1912 $FACEMAP = CFClient::db_table "facemap";
1913 1563
1914 my %DEF_CFG = ( 1564 my %DEF_CFG = (
1915 sdl_mode => 0, 1565 sdl_mode => 0,
1916 width => 640, 1566 width => 640,
1917 height => 480, 1567 height => 480,
1994 1644
1995END { CFClient::SDL_Quit } 1645END { CFClient::SDL_Quit }
1996 1646
1997=head1 NAME 1647=head1 NAME
1998 1648
1999pclient - A Crossfire+ and Crossfire game client 1649cfplus - A Crossfire+ and Crossfire game client
2000 1650
2001=head1 SYNOPSIS 1651=head1 SYNOPSIS
2002 1652
2003Just run it - no commandline arguments are supported. 1653Just run it - no commandline arguments are supported.
2004 1654
2005=head1 USAGE 1655=head1 USAGE
2006 1656
2007Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1657cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
2008fullscreen and interactively. 1658fullscreen and interactively.
2009 1659
1660=head1 DEBUGGING
1661
1662
1663CFPLUS_DEBUG - environment variable
1664
1665 1 draw borders around widgets
1666 2 add low-level widget info to tooltips
1667 4 show fps
1668 8 suppress tooltips
1669
2010=head1 AUTHOR 1670=head1 AUTHOR
2011 1671
2012Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1672Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2013 1673
2014 1674

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines