… | |
… | |
34 | |
34 | |
35 | our @SDL_MODES; |
35 | our @SDL_MODES; |
36 | our $WIDTH; |
36 | our $WIDTH; |
37 | our $HEIGHT; |
37 | our $HEIGHT; |
38 | our $FULLSCREEN; |
38 | our $FULLSCREEN; |
|
|
39 | our $FONTSIZE; |
39 | |
40 | |
40 | our $MAP; |
41 | our $MAP; |
41 | our $MAPWIDGET; |
42 | our $MAPWIDGET; |
42 | our $FONTSIZE; |
|
|
43 | |
43 | |
44 | our $SDL_ACTIVE; |
44 | our $SDL_ACTIVE; |
45 | our $SDL_EV; |
45 | our $SDL_EV; |
46 | our %SDL_CB; |
46 | our %SDL_CB; |
47 | |
47 | |
48 | our $ALT_ENTER_MESSAGE; |
48 | our $ALT_ENTER_MESSAGE; |
49 | our $STATUS_LINE; |
49 | our $STATUS_LINE; |
50 | our $DEBUG_STATUS; |
50 | our $DEBUG_STATUS; |
|
|
51 | our $BUTTONBAR; |
|
|
52 | our $LOGVIEW; |
|
|
53 | our $CONSOLE; |
51 | |
54 | |
52 | sub status { |
55 | sub status { |
53 | $STATUS_LINE->set_text ($_[0]); |
56 | $STATUS_LINE->set_text ($_[0]); |
54 | my ($w, $h) = $STATUS_LINE->size_request; |
57 | my ($w, $h) = $STATUS_LINE->size_request; |
55 | $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); |
58 | $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); |
… | |
… | |
62 | } |
65 | } |
63 | |
66 | |
64 | sub start_game { |
67 | sub start_game { |
65 | status "logging in..."; |
68 | status "logging in..."; |
66 | |
69 | |
67 | my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
70 | my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
68 | |
71 | |
69 | $MAP = new CFClient::Map $mapsize, $mapsize; |
72 | $MAP = new CFClient::Map $mapsize, $mapsize; |
70 | |
73 | |
71 | $CONN = new conn |
74 | $CONN = new conn |
72 | host => $CFG->{host}, |
75 | host => $CFG->{host}, |
… | |
… | |
85 | sub stop_game { |
88 | sub stop_game { |
86 | undef $CONN; |
89 | undef $CONN; |
87 | } |
90 | } |
88 | |
91 | |
89 | sub config_dialog { |
92 | sub config_dialog { |
90 | my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, |
93 | my $dialog = new CFClient::UI::FancyFrame |
91 | child => (my $vbox = new CFClient::UI::VBox); |
94 | child => (my $vbox = new CFClient::UI::VBox); |
92 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
95 | $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); |
93 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
96 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
94 | |
97 | |
95 | $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); |
98 | $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); |
… | |
… | |
132 | |
135 | |
133 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); |
136 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); |
134 | $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { |
137 | $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { |
135 | my ($self, $value) = @_; |
138 | my ($self, $value) = @_; |
136 | $CFG->{fow_smooth} = $value; |
139 | $CFG->{fow_smooth} = $value; |
|
|
140 | }); |
|
|
141 | |
|
|
142 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize"); |
|
|
143 | $table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { |
|
|
144 | my ($self, $value) = @_; |
|
|
145 | $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); |
137 | }); |
146 | }); |
138 | |
147 | |
139 | $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
148 | $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { |
140 | destroy_screen (); |
149 | destroy_screen (); |
141 | init_screen (); |
150 | init_screen (); |
142 | }); |
151 | }); |
143 | |
152 | |
144 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
153 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
145 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
154 | $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); |
146 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); |
155 | $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); |
147 | $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); |
156 | $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub { |
148 | |
157 | my ($self, $value) = @_; |
|
|
158 | $CFG->{host} = $value; |
|
|
159 | }); |
|
|
160 | |
149 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); |
161 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); |
150 | $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); |
162 | $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub { |
|
|
163 | my ($self, $value) = @_; |
|
|
164 | $CFG->{port} = $value; |
|
|
165 | }); |
151 | |
166 | |
152 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); |
167 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); |
153 | $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); |
168 | $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub { |
|
|
169 | my ($self, $value) = @_; |
|
|
170 | $CFG->{user} = $value; |
|
|
171 | }); |
154 | |
172 | |
155 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); |
173 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); |
156 | $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); |
174 | $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { |
|
|
175 | my ($self, $value) = @_; |
|
|
176 | $CFG->{password} = $value; |
|
|
177 | }); |
157 | |
178 | |
|
|
179 | $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd"); |
|
|
180 | $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { |
|
|
181 | my ($self, $value) = @_; |
|
|
182 | $CFG->{say_command} = $value; |
|
|
183 | }); |
|
|
184 | |
158 | $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); |
185 | $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size"); |
159 | $table->add (1, 6, new CFClient::UI::Slider |
186 | $table->add (1, 7, new CFClient::UI::Slider |
160 | req_w => 100, |
187 | req_w => 100, |
161 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
188 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
162 | connect_changed => sub { |
189 | connect_changed => sub { |
163 | my ($self, $value) = @_; |
190 | my ($self, $value) = @_; |
164 | |
191 | |
165 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
192 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
166 | }, |
193 | }, |
167 | ); |
194 | ); |
168 | |
195 | |
169 | $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
196 | $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { |
170 | start_game; |
197 | start_game; |
171 | }); |
198 | }); |
172 | |
199 | |
173 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
200 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
174 | |
201 | |
175 | $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { |
202 | $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { |
176 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
203 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
177 | status "Configuration Saved"; |
204 | status "Configuration Saved"; |
178 | }); |
205 | }); |
179 | $CFClient::UI::TOPLEVEL->add ($dialog); |
206 | |
|
|
207 | $dialog |
|
|
208 | } |
|
|
209 | |
|
|
210 | sub console_window { |
|
|
211 | my $window = new CFClient::UI::FancyFrame |
|
|
212 | border_bg => [1, 1, 1, 0.5], |
|
|
213 | bg => [0.3, 0.3, 0.3, 0.8], |
|
|
214 | user_w => $::WIDTH/4, |
|
|
215 | user_h => $::HEIGHT, |
|
|
216 | child => (my $vbox = new CFClient::UI::VBox); |
|
|
217 | |
|
|
218 | $vbox->add ($LOGVIEW = new CFClient::UI::TextView |
|
|
219 | expand => 1, |
|
|
220 | fontsize => $::CFG->{log_fontsize}, |
|
|
221 | ); |
|
|
222 | |
|
|
223 | $vbox->add (my $input = new CFClient::UI::LineEntry); |
|
|
224 | $input->connect (activate => sub { |
|
|
225 | my ($input, $text) = @_; |
|
|
226 | $input->set_text (''); |
|
|
227 | |
|
|
228 | if ($text =~ /^\/(.*)/) { |
|
|
229 | $::CONN->user_send ("command $1"); |
|
|
230 | } else { |
|
|
231 | my $say_cmd = $::CFG->{say_command} || 'say'; |
|
|
232 | $::CONN->user_send ("command $say_cmd $text"); |
|
|
233 | } |
|
|
234 | 1 |
|
|
235 | }); |
|
|
236 | $input->connect (escape => sub { |
|
|
237 | $MAPWIDGET->focus_in |
|
|
238 | }); |
|
|
239 | $input->focus_in; |
|
|
240 | |
|
|
241 | $CONSOLE = { |
|
|
242 | window => $window, |
|
|
243 | input => $input |
|
|
244 | }; |
|
|
245 | |
|
|
246 | $window |
180 | } |
247 | } |
181 | |
248 | |
182 | sub sdl_init { |
249 | sub sdl_init { |
183 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE |
250 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE |
|
|
251 | #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO |
184 | and die "SDL::Init failed!\n"; |
252 | and die "SDL::Init failed!\n"; |
185 | } |
253 | } |
186 | |
254 | |
187 | sub init_screen { |
255 | sub init_screen { |
188 | sdl_init; |
256 | sdl_init; |
… | |
… | |
223 | |
291 | |
224 | $FONTSIZE = int $HEIGHT / 40; |
292 | $FONTSIZE = int $HEIGHT / 40; |
225 | |
293 | |
226 | ############################################################################# |
294 | ############################################################################# |
227 | |
295 | |
228 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0; |
296 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; |
229 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
297 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
230 | |
298 | |
231 | $STATUS_LINE = new CFClient::UI::Label |
299 | $STATUS_LINE = new CFClient::UI::Label |
232 | padding => 0, |
300 | padding => 0, |
233 | y => $HEIGHT * 49 / 50 - $FONTSIZE; |
301 | y => $HEIGHT * 44 / 45 - $FONTSIZE; |
234 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
302 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
235 | |
303 | |
236 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
304 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
237 | padding => 0, |
305 | padding => 0, |
238 | y => $HEIGHT * 49 / 50, |
306 | y => $HEIGHT * 44 / 45, |
239 | height => $HEIGHT / 50, |
307 | height => $HEIGHT / 45, |
240 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
308 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
241 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
309 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
242 | |
310 | |
243 | $MAPWIDGET = new CFClient::UI::MapWidget; |
|
|
244 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); |
311 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); |
245 | $MAPWIDGET->focus_in; |
312 | $MAPWIDGET->focus_in; |
|
|
313 | $MAPWIDGET->connect (activate_console => sub { |
|
|
314 | my ($mapwidget, $preset) = @_; |
246 | |
315 | |
247 | config_dialog; |
316 | if ($CONSOLE) { |
|
|
317 | $CONSOLE->{input}->focus_in; |
|
|
318 | |
|
|
319 | if ($preset && $CONSOLE->{input}->get_text eq '') { |
|
|
320 | $CONSOLE->{input}->set_text ($preset); |
|
|
321 | } |
|
|
322 | } |
|
|
323 | }); |
|
|
324 | |
|
|
325 | $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); |
|
|
326 | |
|
|
327 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1); |
|
|
328 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window); |
248 | } |
329 | } |
249 | |
330 | |
250 | sub destroy_screen { |
331 | sub destroy_screen { |
251 | $CFClient::UI::TOPLEVEL->{children} = []; |
332 | $CFClient::UI::TOPLEVEL->{children} = []; |
252 | undef $SDL_ACTIVE; |
333 | undef $SDL_ACTIVE; |
… | |
… | |
266 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
347 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
267 | debug sprintf "%3.2f", $fps; |
348 | debug sprintf "%3.2f", $fps; |
268 | |
349 | |
269 | $want_refresh = 0; |
350 | $want_refresh = 0; |
270 | $can_refresh = 0; |
351 | $can_refresh = 0; |
271 | |
|
|
272 | glViewport 0, 0, $WIDTH, $HEIGHT; |
|
|
273 | |
|
|
274 | glMatrixMode GL_PROJECTION; |
|
|
275 | glLoadIdentity; |
|
|
276 | glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; |
|
|
277 | glMatrixMode GL_MODELVIEW; |
|
|
278 | glLoadIdentity; |
|
|
279 | |
|
|
280 | glClearColor +($CFG->{fow_intensity}) x 3, 1; |
|
|
281 | glClear GL_COLOR_BUFFER_BIT; |
|
|
282 | |
352 | |
283 | $CFClient::UI::TOPLEVEL->draw; |
353 | $CFClient::UI::TOPLEVEL->draw; |
284 | |
354 | |
285 | SDL::GLSwapBuffers; |
355 | SDL::GLSwapBuffers; |
286 | |
356 | |
… | |
… | |
361 | sub conn::face_update { |
431 | sub conn::face_update { |
362 | my ($self, $facenum, $face) = @_; |
432 | my ($self, $facenum, $face) = @_; |
363 | |
433 | |
364 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
434 | $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; |
365 | |
435 | |
366 | my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; |
436 | my $tex = $face->{texture} = |
|
|
437 | new_from_image CFClient::Texture |
|
|
438 | delete $face->{image}, minify => 1; |
367 | |
439 | |
368 | $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}); |
440 | $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
369 | $MAPWIDGET->update; |
441 | $MAPWIDGET->update; |
370 | } |
442 | } |
371 | |
443 | |
372 | sub conn::query { |
444 | sub conn::query { |
373 | my ($self, $flags, $prompt) = @_; |
445 | my ($self, $flags, $prompt) = @_; |
374 | |
446 | |
|
|
447 | #TODO |
375 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
448 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
|
|
449 | } |
|
|
450 | |
|
|
451 | sub conn::drawinfo { |
|
|
452 | my ($self, $color, $text) = @_; |
|
|
453 | |
|
|
454 | my @color = ( |
|
|
455 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
|
|
456 | [1.00, 1.00, 1.00], |
|
|
457 | [0.00, 0.00, 0.55], |
|
|
458 | [1.00, 0.00, 0.00], |
|
|
459 | [1.00, 0.54, 0.00], |
|
|
460 | [0.11, 0.56, 1.00], |
|
|
461 | [0.93, 0.46, 0.00], |
|
|
462 | [0.18, 0.54, 0.34], |
|
|
463 | [0.56, 0.73, 0.56], |
|
|
464 | [0.80, 0.80, 0.80], |
|
|
465 | [0.55, 0.41, 0.13], |
|
|
466 | [0.99, 0.77, 0.26], |
|
|
467 | [0.74, 0.65, 0.41], |
|
|
468 | ); |
|
|
469 | |
|
|
470 | $LOGVIEW->add_paragraph ($color[$color], $text); |
376 | } |
471 | } |
377 | |
472 | |
378 | %SDL_CB = ( |
473 | %SDL_CB = ( |
379 | SDL_QUIT() => sub { |
474 | SDL_QUIT() => sub { |
380 | Event::unloop -1; |
475 | Event::unloop -1; |
… | |
… | |
385 | refresh; |
480 | refresh; |
386 | }, |
481 | }, |
387 | SDL_KEYDOWN() => sub { |
482 | SDL_KEYDOWN() => sub { |
388 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
483 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
389 | # alt-enter |
484 | # alt-enter |
390 | $FULLSCREEN = !$FULLSCREEN; |
|
|
391 | destroy_screen; |
485 | destroy_screen; |
|
|
486 | $CFG->{fullscreen} = !$CFG->{fullscreen}; |
392 | init_screen; |
487 | init_screen; |
393 | } else { |
488 | } else { |
394 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
489 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
395 | } |
490 | } |
396 | }, |
491 | }, |
… | |
… | |
414 | ############################################################################# |
509 | ############################################################################# |
415 | |
510 | |
416 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
511 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
417 | |
512 | |
418 | my %DEF_CFG = ( |
513 | my %DEF_CFG = ( |
|
|
514 | sdl_mode => 0, |
419 | width => 640, |
515 | width => 640, |
420 | height => 480, |
516 | height => 480, |
|
|
517 | fullscreen => 0, |
421 | fast => 0, |
518 | fast => 0, |
422 | fow_enable => 1, |
519 | fow_enable => 1, |
423 | fow_intensity => 0.45, |
520 | fow_intensity => 0.45, |
424 | fow_smooth => 0, |
521 | fow_smooth => 0, |
425 | fullscreen => 0, |
522 | log_fontsize => 14, |
426 | sdl_mode => 0, |
|
|
427 | mapsize => 100, |
523 | mapsize => 100, |
428 | host => "crossfire.schmorp.de", |
524 | host => "crossfire.schmorp.de", |
429 | port => 13327, |
525 | port => 13327, |
|
|
526 | say_command => 'say', |
430 | ); |
527 | ); |
431 | |
528 | |
432 | while (my ($k, $v) = each %DEF_CFG) { |
529 | while (my ($k, $v) = each %DEF_CFG) { |
433 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
530 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
434 | } |
531 | } |