… | |
… | |
18 | use CFClient; |
18 | use CFClient; |
19 | use CFClient::UI; |
19 | use CFClient::UI; |
20 | |
20 | |
21 | our $VERSION = '0.1'; |
21 | our $VERSION = '0.1'; |
22 | |
22 | |
23 | my $MAX_FPS = 500; |
23 | my $MAX_FPS = 60; |
24 | my $MIN_FPS = 5; # unused as of yet |
24 | my $MIN_FPS = 5; # unused as of yet |
25 | |
25 | |
26 | our $FACECACHE; |
26 | our $FACECACHE; |
27 | |
27 | |
28 | our $LAST_REFRESH; |
28 | our $LAST_REFRESH; |
… | |
… | |
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); |
… | |
… | |
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"); |
… | |
… | |
117 | my ($self, $value) = @_; |
120 | my ($self, $value) = @_; |
118 | $CFG->{fast} = $value; |
121 | $CFG->{fast} = $value; |
119 | }); |
122 | }); |
120 | |
123 | |
121 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); |
124 | $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War"); |
|
|
125 | $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { |
|
|
126 | my ($self, $value) = @_; |
|
|
127 | $CFG->{fow_enable} = $value; |
|
|
128 | }); |
|
|
129 | |
|
|
130 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity"); |
122 | $table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { |
131 | $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { |
123 | my ($self, $value) = @_; |
132 | my ($self, $value) = @_; |
124 | $CFG->{fow_intensity} = $value; |
133 | $CFG->{fow_intensity} = $value; |
125 | }); |
134 | }); |
126 | |
135 | |
127 | $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW"); |
136 | $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); |
128 | $table->add (1, 4, 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 { |
129 | my ($self, $value) = @_; |
138 | my ($self, $value) = @_; |
130 | $CFG->{fow_smooth} = $value; |
139 | $CFG->{fow_smooth} = $value; |
131 | }); |
140 | }); |
132 | |
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); |
|
|
146 | }); |
|
|
147 | |
133 | $table->add (1, 5, 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 { |
134 | destroy_screen (); |
149 | destroy_screen (); |
135 | init_screen (); |
150 | init_screen (); |
136 | }); |
151 | }); |
137 | |
152 | |
138 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
153 | $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup"); |
139 | $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]); |
140 | $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"); |
141 | $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 { |
142 | |
157 | my ($self, $value) = @_; |
|
|
158 | $CFG->{host} = $value; |
|
|
159 | }); |
|
|
160 | |
143 | $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"); |
144 | $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 | }); |
145 | |
166 | |
146 | $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"); |
147 | $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 | }); |
148 | |
172 | |
149 | $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"); |
150 | $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 | }); |
151 | |
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 | |
152 | $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"); |
153 | $table->add (1, 6, new CFClient::UI::Slider |
186 | $table->add (1, 7, new CFClient::UI::Slider |
154 | req_w => 100, |
187 | req_w => 100, |
155 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
188 | range => [$CFG->{mapsize}, 10, 100 + 1, 1], |
156 | connect_changed => sub { |
189 | connect_changed => sub { |
157 | my ($self, $value) = @_; |
190 | my ($self, $value) = @_; |
158 | |
191 | |
159 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
192 | $CFG->{mapsize} = $self->{range}[0] = $value = int $value; |
160 | }, |
193 | }, |
161 | ); |
194 | ); |
162 | |
195 | |
163 | $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 { |
164 | start_game; |
197 | start_game; |
165 | }); |
198 | }); |
166 | |
199 | |
167 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
200 | $vbox->add (my $hbox = new CFClient::UI::HBox); |
168 | |
201 | |
169 | $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 { |
170 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
203 | CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; |
171 | status "Configuration Saved"; |
204 | status "Configuration Saved"; |
172 | }); |
205 | }); |
173 | $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 |
174 | } |
247 | } |
175 | |
248 | |
176 | sub sdl_init { |
249 | sub sdl_init { |
177 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE |
250 | SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO |
178 | and die "SDL::Init failed!\n"; |
251 | and die "SDL::Init failed!\n"; |
179 | } |
252 | } |
180 | |
253 | |
181 | sub init_screen { |
254 | sub init_screen { |
182 | sdl_init; |
255 | sdl_init; |
… | |
… | |
217 | |
290 | |
218 | $FONTSIZE = int $HEIGHT / 40; |
291 | $FONTSIZE = int $HEIGHT / 40; |
219 | |
292 | |
220 | ############################################################################# |
293 | ############################################################################# |
221 | |
294 | |
222 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0; |
295 | $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; |
223 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
296 | $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); |
224 | |
297 | |
225 | $STATUS_LINE = new CFClient::UI::Label |
298 | $STATUS_LINE = new CFClient::UI::Label |
226 | padding => 0, |
299 | padding => 0, |
227 | y => $HEIGHT * 49 / 50 - $FONTSIZE; |
300 | y => $HEIGHT * 44 / 45 - $FONTSIZE; |
228 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
301 | $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); |
229 | |
302 | |
230 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
303 | $ALT_ENTER_MESSAGE = new CFClient::UI::Label |
231 | padding => 0, |
304 | padding => 0, |
232 | y => $HEIGHT * 49 / 50, |
305 | y => $HEIGHT * 44 / 45, |
233 | height => $HEIGHT / 50, |
306 | height => $HEIGHT / 45, |
234 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
307 | text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; |
235 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
308 | $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); |
236 | |
309 | |
237 | $MAPWIDGET = new CFClient::UI::MapWidget; |
|
|
238 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); |
310 | $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget); |
239 | $MAPWIDGET->focus_in; |
311 | $MAPWIDGET->focus_in; |
|
|
312 | $MAPWIDGET->connect (activate_console => sub { |
|
|
313 | my ($mapwidget, $preset) = @_; |
240 | |
314 | |
241 | config_dialog; |
315 | if ($CONSOLE) { |
|
|
316 | $CONSOLE->{input}->focus_in; |
|
|
317 | |
|
|
318 | if ($preset && $CONSOLE->{input}->get_text eq '') { |
|
|
319 | $CONSOLE->{input}->set_text ($preset); |
|
|
320 | } |
|
|
321 | } |
|
|
322 | }); |
|
|
323 | |
|
|
324 | $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox); |
|
|
325 | |
|
|
326 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1); |
|
|
327 | $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window); |
242 | } |
328 | } |
243 | |
329 | |
244 | sub destroy_screen { |
330 | sub destroy_screen { |
245 | $CFClient::UI::TOPLEVEL->{children} = []; |
331 | $CFClient::UI::TOPLEVEL->{children} = []; |
246 | undef $SDL_ACTIVE; |
332 | undef $SDL_ACTIVE; |
… | |
… | |
258 | |
344 | |
259 | sub force_refresh { |
345 | sub force_refresh { |
260 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
346 | $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; |
261 | debug sprintf "%3.2f", $fps; |
347 | debug sprintf "%3.2f", $fps; |
262 | |
348 | |
263 | # $want_refresh = 0;#d# |
349 | $want_refresh = 0; |
264 | $can_refresh = 0; |
350 | $can_refresh = 0; |
265 | |
|
|
266 | glViewport 0, 0, $WIDTH, $HEIGHT; |
|
|
267 | |
|
|
268 | glMatrixMode GL_PROJECTION; |
|
|
269 | glLoadIdentity; |
|
|
270 | glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; |
|
|
271 | glMatrixMode GL_MODELVIEW; |
|
|
272 | glLoadIdentity; |
|
|
273 | |
|
|
274 | glClearColor +($CFG->{fow_intensity}) x 3, 1; |
|
|
275 | glClear GL_COLOR_BUFFER_BIT; |
|
|
276 | |
351 | |
277 | $CFClient::UI::TOPLEVEL->draw; |
352 | $CFClient::UI::TOPLEVEL->draw; |
278 | |
353 | |
279 | SDL::GLSwapBuffers; |
354 | SDL::GLSwapBuffers; |
280 | |
355 | |
… | |
… | |
364 | } |
439 | } |
365 | |
440 | |
366 | sub conn::query { |
441 | sub conn::query { |
367 | my ($self, $flags, $prompt) = @_; |
442 | my ($self, $flags, $prompt) = @_; |
368 | |
443 | |
|
|
444 | #TODO |
369 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
445 | warn "<<<<QUERY:$flags:$prompt>>>\n";#d# |
|
|
446 | } |
|
|
447 | |
|
|
448 | sub conn::drawinfo { |
|
|
449 | my ($self, $color, $text) = @_; |
|
|
450 | |
|
|
451 | my @color = ( |
|
|
452 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
|
|
453 | [1.00, 1.00, 1.00], |
|
|
454 | [0.00, 0.00, 0.55], |
|
|
455 | [1.00, 0.00, 0.00], |
|
|
456 | [1.00, 0.54, 0.00], |
|
|
457 | [0.11, 0.56, 1.00], |
|
|
458 | [0.93, 0.46, 0.00], |
|
|
459 | [0.18, 0.54, 0.34], |
|
|
460 | [0.56, 0.73, 0.56], |
|
|
461 | [0.80, 0.80, 0.80], |
|
|
462 | [0.55, 0.41, 0.13], |
|
|
463 | [0.99, 0.77, 0.26], |
|
|
464 | [0.74, 0.65, 0.41], |
|
|
465 | ); |
|
|
466 | |
|
|
467 | $LOGVIEW->add_paragraph ($color[$color], $text); |
370 | } |
468 | } |
371 | |
469 | |
372 | %SDL_CB = ( |
470 | %SDL_CB = ( |
373 | SDL_QUIT() => sub { |
471 | SDL_QUIT() => sub { |
374 | Event::unloop -1; |
472 | Event::unloop -1; |
… | |
… | |
379 | refresh; |
477 | refresh; |
380 | }, |
478 | }, |
381 | SDL_KEYDOWN() => sub { |
479 | SDL_KEYDOWN() => sub { |
382 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
480 | if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { |
383 | # alt-enter |
481 | # alt-enter |
384 | $FULLSCREEN = !$FULLSCREEN; |
|
|
385 | destroy_screen; |
482 | destroy_screen; |
|
|
483 | $CFG->{fullscreen} = !$CFG->{fullscreen}; |
386 | init_screen; |
484 | init_screen; |
387 | } else { |
485 | } else { |
388 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
486 | CFClient::UI::feed_sdl_key_down_event ($SDL_EV); |
389 | } |
487 | } |
390 | }, |
488 | }, |
… | |
… | |
408 | ############################################################################# |
506 | ############################################################################# |
409 | |
507 | |
410 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
508 | CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; |
411 | |
509 | |
412 | my %DEF_CFG = ( |
510 | my %DEF_CFG = ( |
|
|
511 | sdl_mode => 0, |
413 | width => 640, |
512 | width => 640, |
414 | height => 480, |
513 | height => 480, |
|
|
514 | fullscreen => 0, |
415 | fast => 0, |
515 | fast => 0, |
|
|
516 | fow_enable => 1, |
416 | fow_intensity => 0.45, |
517 | fow_intensity => 0.45, |
417 | fow_smooth => 0, |
518 | fow_smooth => 0, |
418 | fullscreen => 0, |
519 | log_fontsize => 14, |
419 | sdl_mode => 0, |
|
|
420 | mapsize => 100, |
520 | mapsize => 100, |
421 | host => "crossfire.schmorp.de", |
521 | host => "crossfire.schmorp.de", |
422 | port => 13327, |
522 | port => 13327, |
|
|
523 | say_command => 'say', |
423 | ); |
524 | ); |
424 | |
525 | |
425 | while (my ($k, $v) = each %DEF_CFG) { |
526 | while (my ($k, $v) = each %DEF_CFG) { |
426 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
527 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
427 | } |
528 | } |