ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.10 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.30 by root, Tue May 30 01:42:16 2006 UTC

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

Diff Legend

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