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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.78 by root, Wed Apr 12 00:26:50 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use Glib; 6use Time::HiRes 'time';
7use Gtk2 -init; 7use Event;
8 8
9use SDL; 9use SDL;
10use SDL::App; 10use SDL::App;
11use SDL::Event; 11use SDL::Event;
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants;
15 14
16use Crossfire; 15use Crossfire;
17use Crossfire::Protocol; 16use Crossfire::Protocol;
18 17
19use CFClient; 18use CFClient;
20use CFClient::UI; 19use CFClient::UI;
21 20
22our $VERSION = '0.1'; 21our $VERSION = '0.1';
23 22
24my $MAX_FPS = 60; 23my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 24my $MIN_FPS = 5; # unused as of yet
25
26our $META_SERVER = "crossfire.real-time.com:13326";
26 27
27our $FACECACHE; 28our $FACECACHE;
29
30our $LAST_REFRESH;
31our $NOW;
28 32
29our $CFG; 33our $CFG;
30our $CONN; 34our $CONN;
35our $FAST; # fast, low-quality mode, possibly useful for software-rendering
31 36
32our @SDL_MODES; 37our @SDL_MODES;
33our $WIDTH; 38our $WIDTH;
34our $HEIGHT; 39our $HEIGHT;
35our $FULLSCREEN; 40our $FULLSCREEN;
41our $FONTSIZE;
36 42
37our $NOW; 43our $MAP;
38
39our $MAPWIDGET; 44our $MAPWIDGET;
40our $FONTSIZE; 45our $BUTTONBAR;
46our $LOGVIEW;
47our $CONSOLE;
48our $METASERVER;
41 49
42our $SDL_TIMER; 50our $SDL_ACTIVE;
43our $SDL_APP;
44our $SDL_EV; 51our $SDL_EV;
45our %SDL_CB; 52our %SDL_CB;
46 53
47our $ALT_ENTER_MESSAGE; 54our $ALT_ENTER_MESSAGE;
48our $STATUS_LINE; 55our $STATUS_LINE;
49our $DEBUG_STATUS; 56our $DEBUG_STATUS;
50 57
51my $last_refresh; 58sub status {
52my %ANIMATE; 59 $STATUS_LINE->set_text ($_[0]);
53my $refresh_handler; 60 my ($w, $h) = $STATUS_LINE->size_request;
61 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
62}
54 63
55our ($tw, $te); # Test widget #d# 64sub debug {
65 $DEBUG_STATUS->set_text ($_[0]);
66 my ($w, $h) = $DEBUG_STATUS->size_request;
67 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
68}
56 69
57sub init_screen { 70sub start_game {
58 $SDL_APP = new SDL::App 71 status "logging in...";
59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
60 -title => "Crossfire+ Client",
61 -width => $WIDTH,
62 -height => $HEIGHT,
63 -opengl => 1,
64 -red_size => 5,
65 -green_size => 5,
66 -blue_size => 5,
67 -alpha_size => 0,
68 -double_buffer => 1,
69 -fullscreen => $FULLSCREEN,
70 -resizeable => 0;
71 72
72 $SDL_EV = new SDL::Event; 73 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
73 $SDL_EV->set_unicode (1);
74 74
75 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub { 75 $MAP = new CFClient::Map $mapsize, $mapsize;
76 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
77 while $SDL_EV->poll;
78 76
79 1 77 my ($host, $port) = split /:/, $CFG->{host};
80 };
81
82 $last_refresh = SDL::GetTicks;
83
84 CFClient::gl_init;
85
86 $FONTSIZE = int $HEIGHT / 40;
87
88 #############################################################################
89
90 glClearColor 0.45, 0.45, 0.45, 1;
91
92 glEnable GL_TEXTURE_2D;
93 glEnable GL_COLOR_MATERIAL;
94 glShadeModel GL_FLAT;
95 glDisable GL_DEPTH_TEST;
96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
97
98 #############################################################################
99
100 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
102 78
103 $STATUS_LINE = new CFClient::UI::Label
104 padding => 0,
105 y => $HEIGHT * 49 / 50 - $FONTSIZE;
106 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
107
108 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
109 padding => 0,
110 y => $HEIGHT * 49 / 50,
111 height => $HEIGHT / 50,
112 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
113 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
114
115 $MAPWIDGET = new CFClient::UI::MapWidget;
116 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
117 $MAPWIDGET->focus_in;
118}
119
120sub destroy_screen {
121 remove Glib::Source $SDL_TIMER;
122 undef $SDL_APP;
123 undef $SDL_EV;
124 SDL::Quit;
125}
126
127sub config_dialog {
128 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
129 child => (my $vbox = new CFClient::UI::VBox);
130 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
131 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
132
133 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
134 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
135
136 $hbox->add (my $mode_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
137 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
138
139 $mode_slider->connect (changed => sub {
140 my (undef, $value) = @_;
141
142 $CFG->{sdl_mode} = $value = int $value + 0.5;
143 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
144 });
145 $mode_slider->emit (changed => $mode_slider->{range}[0]);
146
147 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
148 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
149
150 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
151 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
152
153 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
154 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
155
156 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
157 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
158
159 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
160 $table->add (1, 5, my $mapsize_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{mapsize}, 10, 100 + 1, 1]);
161
162 $vbox->add (my $hbox = new CFClient::UI::HBox);
163 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
164 warn "save\n";
165 });
166 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
167 warn "login\n";
168 });
169 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
170 warn "apply\n";
171 });
172
173 $CFClient::UI::TOPLEVEL->add ($dialog);
174}
175
176sub start_game {
177 $WIDTH = $CFG->{width};
178 $HEIGHT = $CFG->{height};
179 $FULLSCREEN = 0;
180
181 init_screen;
182
183 config_dialog;
184
185 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
186
187 $CONN = new conn 79 $CONN = new conn
188 host => $CFG->{host}, 80 host => $host,
189 port => $CFG->{port}, 81 port => $port || 13327,
190 user => $CFG->{user}, 82 user => $CFG->{user},
191 pass => $CFG->{password}, 83 pass => $CFG->{password},
192 mapw => $mapsize, 84 mapw => $mapsize,
193 maph => $mapsize, 85 maph => $mapsize,
194 ; 86 ;
195 87
88 status "login successful";
89
196 CFClient::lowdelay fileno $CONN->{fh}; 90 CFClient::lowdelay fileno $CONN->{fh};
197} 91}
198 92
199sub stop_game { 93sub stop_game {
200 remove Glib::Source $refresh_handler if $refresh_handler;
201 undef $refresh_handler;
202
203 undef $CONN; 94 undef $CONN;
95}
96
97sub client_setup {
98 my $dialog = new CFClient::UI::FancyFrame
99 child => (my $vbox = new CFClient::UI::VBox);
100 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
101 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
102
103 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
104 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
105
106 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
107 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
108
109 $mode_slider->connect (changed => sub {
110 my ($self, $value) = @_;
111
112 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
113 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
114 });
115 $mode_slider->emit (changed => $mode_slider->{range}[0]);
116
117 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
118 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
119 my ($self, $value) = @_;
120 $CFG->{fullscreen} = $value;
121 });
122
123 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast &amp; Ugly");
124 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
125 my ($self, $value) = @_;
126 $CFG->{fast} = $value;
127 });
128
129 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
130 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
131 my ($self, $value) = @_;
132 $CFG->{fow_enable} = $value;
133 });
134
135 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
136 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
137 my ($self, $value) = @_;
138 $CFG->{fow_intensity} = $value;
139 });
140
141 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
142 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
143 my ($self, $value) = @_;
144 $CFG->{fow_smooth} = $value;
145 });
146
147 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
148 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
149 my ($self, $value) = @_;
150 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
151 });
152
153 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
204 destroy_screen; 154 destroy_screen ();
155 init_screen ();
156 });
157
158 $dialog
205} 159}
160
161sub metaserver_dialog {
162 my $dialog = new CFClient::UI::FancyFrame
163 child => (my $vbox = new CFClient::UI::VBox);
164
165 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
166
167 $dialog
168}
169
170sub update_metaserver {
171 my ($HOST) = @_;
172
173 status "fetching metaserver list...";
174
175 my $buf;
176
177 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
178
179 Event->io (fd => $fh, poll => 'r', cb => sub {
180 my $res = sysread $fh, $buf, 8192, length $buf;
181
182 if (!defined $res) {
183 $_[0]->w->cancel;
184 status "metaserver: $!";
185 } elsif ($res == 0) {
186 $_[0]->w->cancel;
187 status "server list retrieved";
188
189 my $table = $METASERVER->{table};
190
191 $table->clear;
192
193 my @col = qw(Use #Users Host Uptime Version Description);
194 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
195 for 0 .. $#col;
196
197 my @align = qw(1 0 1 1 -1);
198
199 my $y = 0;
200 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
201 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
202
203 for ($desc) {
204 s/<br>/\n/gi;
205 s/<li>/\n· /gi;
206 s/<.*?>//sgi;
207 s/&/&amp;/g;
208 s/</&lt;/g;
209 s/>/&gt;/g;
210 }
211
212 $uptime = sprintf "%dd %02d:%02d:%02d",
213 (int $m->[8] / 86400),
214 (int $m->[8] / 3600) % 24,
215 (int $m->[8] / 60) % 60,
216 $m->[8] % 60;
217
218 $m = [$users, $host, $uptime, $version, $desc];
219
220 $y++;
221
222 $table->add (0, $y, new CFClient::UI::VBox children => [
223 (new CFClient::UI::Button text => " ", connect_activate => sub {
224 $HOST->set_text ($CFG->{host} = $host);
225 }),
226 (new CFClient::UI::Empty expand => 1),
227 ]);
228
229 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
230 for 0 .. $#$m;
231 }
232 }
233 });
234}
235
236sub server_setup {
237 my $dialog = new CFClient::UI::FancyFrame
238 child => (my $vbox = new CFClient::UI::VBox);
239
240 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
241 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
242 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
243
244 {
245 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
246
247 $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
248 my ($self, $value) = @_;
249 $CFG->{host} = $value;
250 });
251
252 $METASERVER = metaserver_dialog;
253
254 $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
255 update_metaserver $HOST;
256 });
257 }
258
259 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
260 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
261 my ($self, $value) = @_;
262 $CFG->{user} = $value;
263 });
264
265 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
266 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
267 my ($self, $value) = @_;
268 $CFG->{password} = $value;
269 });
270
271 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
272 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
273 my ($self, $value) = @_;
274 $CFG->{say_command} = $value;
275 });
276
277 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
278 $table->add (1, 7, new CFClient::UI::Slider
279 req_w => 100,
280 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
281 connect_changed => sub {
282 my ($self, $value) = @_;
283
284 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
285 },
286 );
287
288 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
289 start_game;
290 });
291
292 $dialog
293}
294
295sub message_window {
296 my $window = new CFClient::UI::FancyFrame
297 border_bg => [1, 1, 1, 0.5],
298 bg => [0.3, 0.3, 0.3, 0.8],
299 user_w => $::WIDTH/4,
300 user_h => $::HEIGHT,
301 child => (my $vbox = new CFClient::UI::VBox);
302
303 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
304 expand => 1,
305 fontsize => $::CFG->{log_fontsize},
306 );
307
308 $vbox->add (my $input = new CFClient::UI::LineEntry);
309 $input->connect (activate => sub {
310 my ($input, $text) = @_;
311 $input->set_text ('');
312
313 if ($text =~ /^\/(.*)/) {
314 $::CONN->user_send ("command $1");
315 } else {
316 my $say_cmd = $::CFG->{say_command} || 'say';
317 $::CONN->user_send ("command $say_cmd $text");
318 }
319 1
320 });
321 $input->connect (escape => sub {
322 $MAPWIDGET->focus_in
323 });
324 $input->focus_in;
325
326 $CONSOLE = {
327 window => $window,
328 input => $input
329 };
330
331 $window
332}
333
334sub sdl_init {
335 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
336 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
337 and die "SDL::Init failed!\n";
338}
339
340sub init_screen {
341 sdl_init;
342
343 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
344 $FULLSCREEN = $CFG->{fullscreen};
345 $FAST = $CFG->{fast};
346
347 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
348 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
349 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
350 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
351
352 SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
353 SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
354 SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
355 SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
356
357 SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
358 SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
359 SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
360
361 SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
362 SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
363 | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
364 or die "SDL::SetVideoMode failed!\n";
365
366 SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
367
368 $SDL_EV = new SDL::Event;
369 $SDL_EV->set_unicode (1);
370
371 $SDL_ACTIVE = 1;
372
373 $LAST_REFRESH = time - 0.01;
374
375 CFClient::gl_init;
376
377 $FONTSIZE = int $HEIGHT / 40;
378
379 #############################################################################
380
381 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
382 $CFClient::UI::ROOT->add ($DEBUG_STATUS);
383
384 $STATUS_LINE = new CFClient::UI::Label
385 padding => 0,
386 y => $HEIGHT * 44 / 45 - $FONTSIZE;
387 $CFClient::UI::ROOT->add ($STATUS_LINE);
388
389 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
390 padding => 0,
391 y => $HEIGHT * 44 / 45,
392 height => $HEIGHT / 45,
393 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
394 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
395
396 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
397 $MAPWIDGET->focus_in;
398 $MAPWIDGET->connect (activate_console => sub {
399 my ($mapwidget, $preset) = @_;
400
401 if ($CONSOLE) {
402 $CONSOLE->{input}->focus_in;
403
404 if ($preset && $CONSOLE->{input}->get_text eq '') {
405 $CONSOLE->{input}->set_text ($preset);
406 }
407 }
408 });
409
410 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
411
412 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
413 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
414 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
415
416 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
417 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
418 status "Configuration Saved";
419 });
420
421 $BUTTONBAR->{children}[0]->emit ("activate");
422}
423
424sub destroy_screen {
425 $CFClient::UI::ROOT->{children} = [];
426 undef $SDL_ACTIVE;
427 undef $SDL_EV;
428 SDL::Quit;
429}
430
431my %animate_object;
432my $animate_timer;
433
434my $want_refresh;
435my $can_refresh;
436
437my $fps = 9;
206 438
207sub force_refresh { 439sub force_refresh {
208 glViewport 0, 0, $WIDTH, $HEIGHT; 440 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
441 debug sprintf "%3.2f", $fps;
209 442
210 glMatrixMode GL_PROJECTION; 443 $want_refresh = 0;
211 glLoadIdentity; 444 $can_refresh = 0;
212 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
213 glMatrixMode GL_MODELVIEW;
214 glLoadIdentity;
215 445
216 glClear GL_COLOR_BUFFER_BIT;
217
218 $CFClient::UI::TOPLEVEL->draw; 446 $CFClient::UI::ROOT->draw;
219 447
220 SDL::GLSwapBuffers; 448 SDL::GLSwapBuffers;
221}
222 449
223sub debug { 450 $LAST_REFRESH = $NOW;
224 $DEBUG_STATUS->set_text ($_[0]);
225 my ($w, $h) = $DEBUG_STATUS->size_request;
226 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
227} 451}
228 452
229my $FPS; 453my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
454 $NOW = time;
455
456 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
457 while $SDL_EV->poll;
458
459 if (%animate_object) {
460 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
461 $want_refresh++;
462 }
463
464 if ($want_refresh) {
465 force_refresh;
466 } else {
467 $can_refresh = 1;
468 }
469});
230 470
231sub refresh { 471sub refresh {
232 $refresh_handler ||= add Glib::Idle sub { 472 $want_refresh++;
233 if ($SDL_APP) {
234 $NOW = SDL::GetTicks;
235
236 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
237 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
238 $NOW = SDL::GetTicks;
239 }
240
241 my $interval = ($NOW - $last_refresh) * 0.001;
242 $last_refresh = $NOW;
243
244 if ($interval) {
245 $FPS ||= 1 / $interval;
246 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
247 debug sprintf "%5.02f", $FPS;
248 }
249
250 force_refresh;
251 $_->animate ($interval) for grep $_, values %ANIMATE;
252
253 if (%ANIMATE) {
254 1
255 } else {
256 undef $refresh_handler;
257 0
258 }
259 } else {
260 undef $refresh_handler;
261 0
262 }
263 };
264} 473}
265 474
266sub animation_start { 475sub animation_start {
267 my ($widget) = @_; 476 my ($widget) = @_;
268 $ANIMATE{$widget} = $widget; 477 $animate_object{$widget} = $widget;
269 Scalar::Util::weaken $ANIMATE{$widget};
270
271 refresh;
272} 478}
273 479
274sub animation_stop { 480sub animation_stop {
275 my ($widget) = @_; 481 my ($widget) = @_;
276 delete $ANIMATE{$widget}; 482 delete $animate_object{$widget};
483}
484
485@conn::ISA = Crossfire::Protocol::;
486
487sub conn::user_send {
488 my ($self, $command) = @_;
489
490 $self->send ($command);
491 status $command;
492}
493
494sub conn::feed_map1a {
495 my ($self, $data) = @_;
496
497# $self->Crossfire::Protocol::feed_map1a ($data);
498
499 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
500 $MAP->map1a_update ($data);
501 $MAPWIDGET->update;
502}
503
504#sub conn::map_update {
505# my ($self, $dirty) = @_;
506#
507# $MAPWIDGET->update;
508#}
509
510sub conn::map_clear {
511 my ($self) = @_;
512
513 $MAP->clear;
514
515# refresh;
516}
517
518sub conn::map_info {
519 my ($self, $mode, $x, $y, $w, $h, $hash) = @_;
520
521 warn "mapinfo <$mode,$x,$y,$w,$h,$hash>\n";#d#
522}
523
524sub conn::face_find {
525 my ($self, $face) = @_;
526
527 my $data;
528
529 $FACECACHE->get ("$face->{chksum},$face->{name}")
530}
531
532sub conn::face_update {
533 my ($self, $facenum, $face) = @_;
534
535 $FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
536
537 my $tex = $face->{texture} =
538 new_from_image CFClient::Texture
539 delete $face->{image}, minify => 1;
540
541 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
542 $MAPWIDGET->update;
543}
544
545sub conn::query {
546 my ($self, $flags, $prompt) = @_;
547
548 #TODO
549 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
550}
551
552sub conn::drawinfo {
553 my ($self, $color, $text) = @_;
554
555 my @color = (
556 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
557 [1.00, 1.00, 1.00],
558 [0.00, 0.00, 0.55],
559 [1.00, 0.00, 0.00],
560 [1.00, 0.54, 0.00],
561 [0.11, 0.56, 1.00],
562 [0.93, 0.46, 0.00],
563 [0.18, 0.54, 0.34],
564 [0.56, 0.73, 0.56],
565 [0.80, 0.80, 0.80],
566 [0.55, 0.41, 0.13],
567 [0.99, 0.77, 0.26],
568 [0.74, 0.65, 0.41],
569 );
570
571 $LOGVIEW->add_paragraph ($color[$color], $text);
277} 572}
278 573
279%SDL_CB = ( 574%SDL_CB = (
280 SDL_QUIT() => sub { 575 SDL_QUIT() => sub {
281 main_quit Gtk2; 576 Event::unloop -1;
282 }, 577 },
283 SDL_VIDEORESIZE() => sub { 578 SDL_VIDEORESIZE() => sub {
284 }, 579 },
285 SDL_VIDEOEXPOSE() => sub { 580 SDL_VIDEOEXPOSE() => sub {
286 refresh; 581 refresh;
287 }, 582 },
288 SDL_KEYDOWN() => sub { 583 SDL_KEYDOWN() => sub {
289 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 584 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
290 # alt-enter 585 # alt-enter
291 $FULLSCREEN = !$FULLSCREEN; 586 destroy_screen;
587 $CFG->{fullscreen} = !$CFG->{fullscreen};
292 init_screen; 588 init_screen;
293 } else { 589 } else {
294 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 590 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
295 } 591 }
296 }, 592 },
309 SDL_ACTIVEEVENT() => sub { 605 SDL_ACTIVEEVENT() => sub {
310# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 606# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
311 }, 607 },
312); 608);
313 609
314@conn::ISA = Crossfire::Protocol::;
315
316sub conn::map_update {
317 my ($self, $dirty) = @_;
318
319 $MAPWIDGET->update;
320}
321
322sub conn::map_scroll {
323 my ($self, $dx, $dy) = @_;
324
325# refresh;
326}
327
328sub conn::map_clear {
329 my ($self) = @_;
330
331# refresh;
332}
333
334sub conn::face_find {
335 my ($self, $face) = @_;
336
337 $FACECACHE->{"$face->{chksum},$face->{name}"}
338}
339
340sub conn::face_update {
341 my ($self, $face) = @_;
342
343 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
344
345 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
346}
347
348sub conn::query {
349 my ($self, $flags, $prompt) = @_;
350
351 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
352}
353
354sub gtk_add_cfg_field {
355 my ($tbl, $cfg, $klbl, $key, $value) = @_;
356 my $i = $cfg->{_i}++;
357 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
358 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
359 if ($key eq 'password') {
360 $ent->set_invisible_char ("*");
361 $ent->set (visibility => 0)
362 }
363 $ent->set_text ($value);
364 $ent->signal_connect (changed => sub {
365 my ($ent) = @_;
366 $cfg->{$key} = $ent->get_text;
367 # TODO: Mapsize should be a slider in the game gui
368 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
369 $cfg->{$key} = 100;
370 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
371 $cfg->{$key} = 50;
372 }
373 });
374}
375
376sub run_config_dialog {
377 my (%events) = @_;
378
379 my $w = Gtk2::Window->new;
380
381 my @cfg = (
382 [qw/Host host/],
383 [qw/Port port/],
384 [qw/Mapsize% mapsize/],
385 [qw/Username user/],
386 [qw/Password password/],
387 );
388
389 my $cfg = {};
390
391 $w->add (my $vb = Gtk2::VBox->new);
392 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
393 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
394 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
395 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
396 my $i = 0;
397 my $act = 0;
398 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
399 if ($_ eq $selmode) { $act = $i }
400 $cb->append_text ($_);
401 $i++;
402 }
403 $cb->set_active ($act);
404 $cb->signal_connect (changed => sub {
405 my ($cb) = @_;
406 my $txt = $cb->get_active_text;
407 if ($txt =~ m/(\d+)x(\d+)/) {
408 $::CFG->{width} = $1;
409 $::CFG->{height} = $2;
410 }
411 });
412
413 $cfg->{_i} = 1;
414 for (@cfg) {
415 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
416 }
417
418 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
419 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
420 $cb->signal_connect (clicked => sub {
421 for (keys %$cfg) {
422 $::CFG->{$_} = $cfg->{$_}
423 if $_ ne '_i';
424 }
425 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
426 });
427 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
428 $cb->signal_connect (clicked => sub {
429 for (keys %$cfg) {
430 $::CFG->{$_} = $cfg->{$_}
431 if $_ ne '_i';
432 }
433 my $cb = $events{login} || sub {};
434 $cb->($::CFG->{user}, $::CFG->{password});
435 });
436 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
437 $cb->signal_connect (clicked => sub {
438 my $cb = $events{logout} || sub {};
439 $cb->();
440 });
441 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
442 $cb->signal_connect (clicked => sub { $w->destroy });
443
444 $w->show_all;
445
446 $w->signal_connect (destroy => sub { Gtk2->main_quit });
447}
448
449
450############################################################################# 610#############################################################################
451 611
452SDL::Init SDL_INIT_EVERYTHING; 612$FACECACHE = CFClient::db_table "facecache";
453
454@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
455 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
456 613
457CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 614CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
458 615
459$CFG ||= { 616my %DEF_CFG = (
617 sdl_mode => 0,
460 width => 640, 618 width => 640,
461 height => 480, 619 height => 480,
620 fullscreen => 0,
621 fast => 0,
622 fow_enable => 1,
623 fow_intensity => 0.45,
624 fow_smooth => 0,
625 log_fontsize => 14,
462 mapsize => 100, 626 mapsize => 100,
463 fullscreen => 0,
464 host => "crossfire.schmorp.de", 627 host => "crossfire.schmorp.de",
465 port => 13327, 628 say_command => 'say',
466}; 629);
630
631while (my ($k, $v) = each %DEF_CFG) {
632 $CFG->{$k} = $v unless exists $CFG->{$k};
633}
634
635sdl_init;
636
637@SDL_MODES = reverse
638 grep $_->[0] >= 640 && $_->[1] >= 480,
639 map [SDL::RectW ($_), SDL::RectH ($_)],
640 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
641
642@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
643
644$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
645
646init_screen;
467 647
468{ 648{
469 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 649 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
470 650
471 CFClient::add_font $_ for @fonts; 651 CFClient::add_font $_ for @fonts;
472 CFClient::set_font $fonts[0]; 652 CFClient::set_font $fonts[0];
473} 653}
474 654
475$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 655Event::loop;
476 656
477run_config_dialog
478 login => sub { start_game },
479 logout => sub { stop_game };
480 657
481main Gtk2;
482
483Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines