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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines