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.83 by root, Wed Apr 12 15:35:55 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 21:16:51 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;
31our $FAST; # fast, low-quality mode 35our $FAST; # fast, low-quality mode, possibly useful for software-rendering
32 36
33our @SDL_MODES; 37our @SDL_MODES;
34our $WIDTH; 38our $WIDTH;
35our $HEIGHT; 39our $HEIGHT;
36our $FULLSCREEN; 40our $FULLSCREEN;
41our $FONTSIZE;
37 42
38our $NOW; 43our $MAP;
39
40our $MAPWIDGET; 44our $MAPWIDGET;
41our $FONTSIZE; 45our $BUTTONBAR;
46our $LOGVIEW;
47our $CONSOLE;
48our $METASERVER;
42 49
43our $SDL_TIMER; 50our $SDL_ACTIVE;
44our $SDL_APP;
45our $SDL_EV; 51our $SDL_EV;
46our %SDL_CB; 52our %SDL_CB;
47 53
48our $ALT_ENTER_MESSAGE; 54our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE; 55our $STATUS_LINE;
50our $DEBUG_STATUS; 56our $DEBUG_STATUS;
51
52my $last_refresh;
53my %ANIMATE;
54my $refresh_handler;
55 57
56sub status { 58sub status {
57 $STATUS_LINE->set_text ($_[0]); 59 $STATUS_LINE->set_text ($_[0]);
58 my ($w, $h) = $STATUS_LINE->size_request; 60 my ($w, $h) = $STATUS_LINE->size_request;
59 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 61 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
… …
63 $DEBUG_STATUS->set_text ($_[0]); 65 $DEBUG_STATUS->set_text ($_[0]);
64 my ($w, $h) = $DEBUG_STATUS->size_request; 66 my ($w, $h) = $DEBUG_STATUS->size_request;
65 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h); 67 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
66} 68}
67 69
68sub config_dialog { 70sub start_game {
69 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, 71 status "logging in...";
70 child => (my $vbox = new CFClient::UI::VBox);
71 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
72 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
73 72
74 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 73 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
75 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
76 74
77 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 75 $MAP = new CFClient::Map $mapsize, $mapsize;
78 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
79 76
80 $mode_slider->connect (changed => sub { 77 my ($host, $port) = split /:/, $CFG->{host};
81 my ($self, $value) = @_;
82
83 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
84 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
85 });
86 $mode_slider->emit (changed => $mode_slider->{range}[0]);
87
88 $table->add (1, 1, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
89 destroy_screen ();
90 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
91 $FULLSCREEN = $CFG->{fullscreen};
92 init_screen ();
93 });
94 78
95 $vbox->add (new CFClient::UI::Label align => 0, text => "Server");
96 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
98 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
99
100 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
101 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
102
103 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
104 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
105
106 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
107 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
108
109 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
110 $table->add (1, 6, new CFClient::UI::Slider
111 req_w => 100,
112 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
113 connect_changed => sub {
114 my ($self, $value) = @_;
115
116 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
117 },
118 );
119
120 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
121 warn "login\n";
122 });
123
124 $vbox->add (my $hbox = new CFClient::UI::HBox);
125
126 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
127 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
128 status "Configuration Saved";
129 });
130 $CFClient::UI::TOPLEVEL->add ($dialog);
131}
132
133sub init_screen {
134 $SDL_APP = new SDL::App
135 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
136 -title => "Crossfire+ Client",
137 -width => $WIDTH,
138 -height => $HEIGHT,
139 -opengl => 1,
140 -red_size => 5,
141 -green_size => 5,
142 -blue_size => 5,
143 -alpha_size => 0,
144 -double_buffer => 1,
145 -fullscreen => $FULLSCREEN,
146 -resizeable => 0;
147
148 $SDL_EV = new SDL::Event;
149 $SDL_EV->set_unicode (1);
150
151 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
152 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
153 while $SDL_EV->poll;
154
155 1
156 };
157
158 $last_refresh = SDL::GetTicks;
159
160 CFClient::gl_init;
161
162 $FONTSIZE = int $HEIGHT / 40;
163
164 #############################################################################
165
166 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
167 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
168
169 $STATUS_LINE = new CFClient::UI::Label
170 padding => 0,
171 y => $HEIGHT * 49 / 50 - $FONTSIZE;
172 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
173
174 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
175 padding => 0,
176 y => $HEIGHT * 49 / 50,
177 height => $HEIGHT / 50,
178 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
179 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
180
181 $MAPWIDGET = new CFClient::UI::MapWidget;
182 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
183 $MAPWIDGET->focus_in;
184
185 config_dialog;
186}
187
188sub destroy_screen {
189 $CFClient::UI::TOPLEVEL->{children} = [];
190 remove Glib::Source $SDL_TIMER;
191 undef $SDL_APP;
192 undef $SDL_EV;
193 SDL::Quit;
194}
195
196sub start_game {
197 $WIDTH = $CFG->{width};
198 $HEIGHT = $CFG->{height};
199 $FULLSCREEN = 0;
200
201 init_screen;
202
203 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
204
205 $CONN = new conn 79 $CONN = new conn
206 host => $CFG->{host}, 80 host => $host,
207 port => $CFG->{port}, 81 port => $port || 13327,
208 user => $CFG->{user}, 82 user => $CFG->{user},
209 pass => $CFG->{password}, 83 pass => $CFG->{password},
210 mapw => $mapsize, 84 mapw => $mapsize,
211 maph => $mapsize, 85 maph => $mapsize,
212 ; 86 ;
213 87
88 status "login successful";
89
214 CFClient::lowdelay fileno $CONN->{fh}; 90 CFClient::lowdelay fileno $CONN->{fh};
215} 91}
216 92
217sub stop_game { 93sub stop_game {
218 remove Glib::Source $refresh_handler if $refresh_handler;
219 undef $refresh_handler;
220
221 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 {
222 destroy_screen; 154 destroy_screen ();
155 init_screen ();
156 });
157
158 $dialog
223} 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;
224 438
225sub force_refresh { 439sub force_refresh {
226 glViewport 0, 0, $WIDTH, $HEIGHT; 440 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
441 debug sprintf "%3.2f", $fps;
227 442
228 glMatrixMode GL_PROJECTION; 443 $want_refresh = 0;
229 glLoadIdentity; 444 $can_refresh = 0;
230 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
231 glMatrixMode GL_MODELVIEW;
232 glLoadIdentity;
233 445
234 glClear GL_COLOR_BUFFER_BIT;
235
236 $CFClient::UI::TOPLEVEL->draw; 446 $CFClient::UI::ROOT->draw;
237 447
238 SDL::GLSwapBuffers; 448 SDL::GLSwapBuffers;
239}
240 449
241my $FPS; 450 $LAST_REFRESH = $NOW;
451}
452
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});
242 470
243sub refresh { 471sub refresh {
244 $refresh_handler ||= add Glib::Idle sub { 472 $want_refresh++;
245 if ($SDL_APP) {
246 $NOW = SDL::GetTicks;
247
248 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
249 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
250 $NOW = SDL::GetTicks;
251 }
252
253 my $interval = ($NOW - $last_refresh) * 0.001;
254 $last_refresh = $NOW;
255
256 if ($interval) {
257 $FPS ||= 1 / $interval;
258 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
259 debug sprintf "%5.02f", $FPS;
260 }
261
262 force_refresh;
263 $_->animate ($interval) for grep $_, values %ANIMATE;
264
265 if (%ANIMATE) {
266 1
267 } else {
268 undef $refresh_handler;
269 0
270 }
271 } else {
272 undef $refresh_handler;
273 0
274 }
275 };
276} 473}
277 474
278sub animation_start { 475sub animation_start {
279 my ($widget) = @_; 476 my ($widget) = @_;
280 $ANIMATE{$widget} = $widget; 477 $animate_object{$widget} = $widget;
281 Scalar::Util::weaken $ANIMATE{$widget};
282
283 refresh;
284} 478}
285 479
286sub animation_stop { 480sub animation_stop {
287 my ($widget) = @_; 481 my ($widget) = @_;
288 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::face_find {
519 my ($self, $face) = @_;
520
521 my $data;
522
523 $FACECACHE->get ("$face->{chksum},$face->{name}")
524}
525
526sub conn::face_update {
527 my ($self, $facenum, $face) = @_;
528
529 $FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
530
531 my $tex = $face->{texture} =
532 new_from_image CFClient::Texture
533 delete $face->{image}, minify => 1;
534
535 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
536 $MAPWIDGET->update;
537}
538
539sub conn::query {
540 my ($self, $flags, $prompt) = @_;
541
542 #TODO
543 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
544}
545
546sub conn::drawinfo {
547 my ($self, $color, $text) = @_;
548
549 my @color = (
550 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
551 [1.00, 1.00, 1.00],
552 [0.00, 0.00, 0.55],
553 [1.00, 0.00, 0.00],
554 [1.00, 0.54, 0.00],
555 [0.11, 0.56, 1.00],
556 [0.93, 0.46, 0.00],
557 [0.18, 0.54, 0.34],
558 [0.56, 0.73, 0.56],
559 [0.80, 0.80, 0.80],
560 [0.55, 0.41, 0.13],
561 [0.99, 0.77, 0.26],
562 [0.74, 0.65, 0.41],
563 );
564
565 $LOGVIEW->add_paragraph ($color[$color], $text);
289} 566}
290 567
291%SDL_CB = ( 568%SDL_CB = (
292 SDL_QUIT() => sub { 569 SDL_QUIT() => sub {
293 main_quit Gtk2; 570 Event::unloop -1;
294 }, 571 },
295 SDL_VIDEORESIZE() => sub { 572 SDL_VIDEORESIZE() => sub {
296 }, 573 },
297 SDL_VIDEOEXPOSE() => sub { 574 SDL_VIDEOEXPOSE() => sub {
298 refresh; 575 refresh;
299 }, 576 },
300 SDL_KEYDOWN() => sub { 577 SDL_KEYDOWN() => sub {
301 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 578 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
302 # alt-enter 579 # alt-enter
303 $FULLSCREEN = !$FULLSCREEN;
304 destroy_screen; 580 destroy_screen;
581 $CFG->{fullscreen} = !$CFG->{fullscreen};
305 init_screen; 582 init_screen;
306 } else { 583 } else {
307 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 584 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
308 } 585 }
309 }, 586 },
… …
322 SDL_ACTIVEEVENT() => sub { 599 SDL_ACTIVEEVENT() => sub {
323# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 600# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
324 }, 601 },
325); 602);
326 603
327@conn::ISA = Crossfire::Protocol::;
328
329sub conn::map_update {
330 my ($self, $dirty) = @_;
331
332 $MAPWIDGET->update;
333}
334
335sub conn::map_scroll {
336 my ($self, $dx, $dy) = @_;
337
338# refresh;
339}
340
341sub conn::map_clear {
342 my ($self) = @_;
343
344# refresh;
345}
346
347sub conn::face_find {
348 my ($self, $face) = @_;
349
350 $FACECACHE->{"$face->{chksum},$face->{name}"}
351}
352
353sub conn::face_update {
354 my ($self, $face) = @_;
355
356 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
357
358 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
359}
360
361sub conn::query {
362 my ($self, $flags, $prompt) = @_;
363
364 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
365}
366
367sub gtk_add_cfg_field {
368 my ($tbl, $cfg, $klbl, $key, $value) = @_;
369 my $i = $cfg->{_i}++;
370 $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
371 $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
372 if ($key eq 'password') {
373 $ent->set_invisible_char ("*");
374 $ent->set (visibility => 0)
375 }
376 $ent->set_text ($value);
377 $ent->signal_connect (changed => sub {
378 my ($ent) = @_;
379 $cfg->{$key} = $ent->get_text;
380 # TODO: Mapsize should be a slider in the game gui
381 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
382 $cfg->{$key} = 100;
383 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
384 $cfg->{$key} = 50;
385 }
386 });
387}
388
389sub run_config_dialog {
390 my (%events) = @_;
391
392 my $w = Gtk2::Window->new;
393
394 my @cfg = (
395 [qw/Host host/],
396 [qw/Port port/],
397 [qw/Mapsize% mapsize/],
398 [qw/Username user/],
399 [qw/Password password/],
400 );
401
402 my $cfg = {};
403
404 $w->add (my $vb = Gtk2::VBox->new);
405 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
406 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
407 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
408 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
409 my $i = 0;
410 my $act = 0;
411 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
412 if ($_ eq $selmode) { $act = $i }
413 $cb->append_text ($_);
414 $i++;
415 }
416 $cb->set_active ($act);
417 $cb->signal_connect (changed => sub {
418 my ($cb) = @_;
419 my $txt = $cb->get_active_text;
420 if ($txt =~ m/(\d+)x(\d+)/) {
421 $::CFG->{width} = $1;
422 $::CFG->{height} = $2;
423 }
424 });
425
426 $cfg->{_i} = 1;
427 for (@cfg) {
428 gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
429 }
430
431 $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
432 $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
433 $cb->signal_connect (clicked => sub {
434 for (keys %$cfg) {
435 $::CFG->{$_} = $cfg->{$_}
436 if $_ ne '_i';
437 }
438 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
439 });
440 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
441 $cb->signal_connect (clicked => sub {
442 for (keys %$cfg) {
443 $::CFG->{$_} = $cfg->{$_}
444 if $_ ne '_i';
445 }
446 my $cb = $events{login} || sub {};
447 $cb->($::CFG->{user}, $::CFG->{password});
448 });
449 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
450 $cb->signal_connect (clicked => sub {
451 my $cb = $events{logout} || sub {};
452 $cb->();
453 });
454 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
455 $cb->signal_connect (clicked => sub { $w->destroy });
456
457 $w->show_all;
458
459 $w->signal_connect (destroy => sub { Gtk2->main_quit });
460}
461
462
463############################################################################# 604#############################################################################
464 605
465SDL::Init SDL_INIT_EVERYTHING; 606$FACECACHE = CFClient::db_table "facecache";
466
467@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
468 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
469 607
470CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 608CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
471 609
472$CFG ||= { 610my %DEF_CFG = (
611 sdl_mode => 0,
473 width => 640, 612 width => 640,
474 height => 480, 613 height => 480,
475 fullscreen => 0, 614 fullscreen => 0,
476 sdl_mode => 0, 615 fast => 0,
616 fow_enable => 1,
617 fow_intensity => 0.45,
618 fow_smooth => 0,
619 log_fontsize => 14,
477 mapsize => 100, 620 mapsize => 100,
478 host => "crossfire.schmorp.de", 621 host => "crossfire.schmorp.de",
479 port => 13327, 622 say_command => 'say',
480}; 623);
624
625while (my ($k, $v) = each %DEF_CFG) {
626 $CFG->{$k} = $v unless exists $CFG->{$k};
627}
628
629sdl_init;
630
631@SDL_MODES = reverse
632 grep $_->[0] >= 640 && $_->[1] >= 480,
633 map [SDL::RectW ($_), SDL::RectH ($_)],
634 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
635
636@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
637
638$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
639
640init_screen;
481 641
482{ 642{
483 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 643 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
484 644
485 CFClient::add_font $_ for @fonts; 645 CFClient::add_font $_ for @fonts;
486 CFClient::set_font $fonts[0]; 646 CFClient::set_font $fonts[0];
487} 647}
488 648
489$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 649Event::loop;
490 650
491run_config_dialog
492 login => sub { start_game },
493 logout => sub { stop_game };
494 651
495main Gtk2;
496
497Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
498

Diff Legend

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