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

Diff Legend

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