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

Diff Legend

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