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

Diff Legend

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