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.24 by root, Fri Apr 7 20:34:44 2006 UTC vs.
Revision 1.76 by root, Tue Apr 11 22:14:14 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
2use strict; 3use strict;
4use utf8;
3 5
4use Glib; 6use Glib;
5use Gtk2 -init; 7use Gtk2 -init;
6 8
7use SDL; 9use SDL;
10use SDL::Surface; 12use SDL::Surface;
11use SDL::OpenGL; 13use SDL::OpenGL;
12use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
13 15
14use Crossfire; 16use Crossfire;
15use Crossfire::Client;
16use Crossfire::Protocol; 17use Crossfire::Protocol;
17 18
18use Crossfire::Client::Util; 19use CFClient;
19use Crossfire::Client::Widget; 20use CFClient::UI;
21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
20 26
21our $FACECACHE; 27our $FACECACHE;
22
23our $VERSION = '0.1';
24 28
25our $CFG; 29our $CFG;
26our $CONN; 30our $CONN;
27 31
28our $GUIFONT; 32our @SDL_MODES;
33our $WIDTH;
34our $HEIGHT;
35our $FULLSCREEN;
36
37our $NOW;
38
39our $MAPWIDGET;
40our $FONTSIZE;
29 41
30our $SDL_TIMER; 42our $SDL_TIMER;
31our $SDL_APP; 43our $SDL_APP;
32our $SDL_EV = new SDL::Event; 44our $SDL_EV;
33our %SDL_CB; 45our %SDL_CB;
34 46
35our @GL_INIT; # hooks called on every gl init 47our $ALT_ENTER_MESSAGE;
48our $STATUS_LINE;
49our $DEBUG_STATUS;
50
51my $last_refresh;
52my %ANIMATE;
53my $refresh_handler;
54
55our ($tw, $te); # Test widget #d#
36 56
37sub init_screen { 57sub init_screen {
38 $SDL_APP = new SDL::App 58 $SDL_APP = new SDL::App
39 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
40 -title => "Crossfire+ Client", 60 -title => "Crossfire+ Client",
41 -width => $CFG->{width}, 61 -width => $WIDTH,
42 -height => $CFG->{height}, 62 -height => $HEIGHT,
43 -opengl => 1, 63 -opengl => 1,
44 -red_size => 8, 64 -red_size => 5,
45 -green_size => 8, 65 -green_size => 5,
46 -blue_size => 8, 66 -blue_size => 5,
67 -alpha_size => 0,
47 -double_buffer => 1, 68 -double_buffer => 1,
48 -fullscreen => $CFG->{fullscreen}, 69 -fullscreen => $FULLSCREEN,
49 -resizeable => 0; 70 -resizeable => 0;
50 71
72 $SDL_EV = new SDL::Event;
73 $SDL_EV->set_unicode (1);
74
75 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
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 / 50;
87
88 #############################################################################
89
51 glClearColor 0, 0, 0, 0; 90 glClearColor 0.45, 0.45, 0.45, 1;
52 91
53 glEnable GL_TEXTURE_2D; 92 glEnable GL_TEXTURE_2D;
54 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 93 glEnable GL_COLOR_MATERIAL;
55 glShadeModel GL_FLAT; 94 glShadeModel GL_FLAT;
56 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
57 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
58 glEnable GL_BLEND; 97
98 #############################################################################
99
100 $DEBUG_STATUS = new CFClient::UI::Label;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
102
103 $STATUS_LINE = new CFClient::UI::Label
104 y => $HEIGHT * 59 / 60 - $FONTSIZE;
105 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
106
107 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
108 y => $HEIGHT * 59 / 60,
109 height => $HEIGHT / 60,
110 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
111 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
112
113 $MAPWIDGET = new CFClient::UI::MapWidget;
114 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
115 $MAPWIDGET->focus_in;
116}
117
118sub destroy_screen {
119 remove Glib::Source $SDL_TIMER;
120 undef $SDL_APP;
121 undef $SDL_EV;
122 SDL::Quit;
123}
124
125sub config_dialog {
126 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
127 child => (my $vbox = new CFClient::UI::VBox);
128 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
129 $vbox->add (my $table = new CFClient::UI::Table expand => 1);
130
131 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
132 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
133
134 $hbox->add (my $mode_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
135 $hbox->add (my $mode_label = new CFClient::UI::Label);
136
137 $mode_slider->connect (changed => sub {
138 my (undef, $value) = @_;
139
140 $CFG->{sdl_mode} = $value = int $value + 0.5;
141 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
142 });
143 $mode_slider->emit (changed => $mode_slider->{range}[0]);
144
145 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
146 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
147
148 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
149 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
150
151 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
152 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
153
154 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
155 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
156
157 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
158 $table->add (1, 5, my $mapsize_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{mapsize}, 10, 100 + 1, 1]);
159
160 $CFClient::UI::TOPLEVEL->add ($dialog);
161}
162
163sub start_game {
164 $WIDTH = $CFG->{width};
165 $HEIGHT = $CFG->{height};
166 $FULLSCREEN = 0;
167
168 init_screen;
169
170 config_dialog;
171
172 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
173
174 $CONN = new conn
175 host => $CFG->{host},
176 port => $CFG->{port},
177 user => $CFG->{user},
178 pass => $CFG->{password},
179 mapw => $mapsize,
180 maph => $mapsize,
181 ;
182
183 CFClient::lowdelay fileno $CONN->{fh};
184}
185
186sub stop_game {
187 remove Glib::Source $refresh_handler if $refresh_handler;
188 undef $refresh_handler;
189
190 undef $CONN;
191 destroy_screen;
192}
193
194sub force_refresh {
195 glViewport 0, 0, $WIDTH, $HEIGHT;
59 196
60 glMatrixMode GL_PROJECTION; 197 glMatrixMode GL_PROJECTION;
61 glLoadIdentity; 198 glLoadIdentity;
62 glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100; 199 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
63
64 glMatrixMode GL_MODELVIEW; 200 glMatrixMode GL_MODELVIEW;
201 glLoadIdentity;
65 202
66 $_->() for @GL_INIT; 203 glClear GL_COLOR_BUFFER_BIT;
67}
68 204
69my $label;#d# 205 $CFClient::UI::TOPLEVEL->draw;
70 206
71sub start_game { 207 SDL::GLSwapBuffers;
72 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 208}
73 while ($SDL_EV->poll) { 209
74 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 210sub debug {
211 $DEBUG_STATUS->set_text ($_[0]);
212 my ($w, $h) = $DEBUG_STATUS->size_request;
213 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
214}
215
216my $FPS;
217
218sub refresh {
219 $refresh_handler ||= add Glib::Idle sub {
220 if ($SDL_APP) {
221 $NOW = SDL::GetTicks;
222
223 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
224 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
225 $NOW = SDL::GetTicks;
226 }
227
228 my $interval = ($NOW - $last_refresh) * 0.001;
229 $last_refresh = $NOW;
230
231 if ($interval) {
232 $FPS ||= 1 / $interval;
233 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
234 debug sprintf "%5.02f", $FPS;
235 }
236
237 force_refresh;
238 $_->animate ($interval) for grep $_, values %ANIMATE;
239
240 if (%ANIMATE) {
241 1
242 } else {
243 undef $refresh_handler;
244 0
245 }
246 } else {
247 undef $refresh_handler;
248 0
75 } 249 }
76
77 1
78 }; 250 };
79
80 init_screen;
81
82# $label = new Crossfire::Client::Widget::Label "Testü[]";
83# $label->activate;
84
85 $CONN = new conn
86 host => $CFG->{host},
87 port => $CFG->{port};
88} 251}
89 252
90sub stop_game { 253sub animation_start {
91 remove Glib::Source $SDL_TIMER; 254 my ($widget) = @_;
255 $ANIMATE{$widget} = $widget;
256 Scalar::Util::weaken $ANIMATE{$widget};
92 257
93 undef $SDL_APP; 258 refresh;
94 SDL::Quit;
95} 259}
96 260
97sub refresh { 261sub animation_stop {
98 glClear GL_COLOR_BUFFER_BIT; 262 my ($widget) = @_;
99 263 delete $ANIMATE{$widget};
100 $_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS;
101
102 SDL::GLSwapBuffers;
103} 264}
104 265
105%SDL_CB = ( 266%SDL_CB = (
106 SDL_QUIT() => sub { 267 SDL_QUIT() => sub {
107 main_quit Gtk2; 268 main_quit Gtk2;
112 refresh; 273 refresh;
113 }, 274 },
114 SDL_KEYDOWN() => sub { 275 SDL_KEYDOWN() => sub {
115 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 276 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
116 # alt-enter 277 # alt-enter
117 $CFG->{fullscreen} = !$CFG->{fullscreen}; 278 $FULLSCREEN = !$FULLSCREEN;
118 init_screen; 279 init_screen;
119 } else { 280 } else {
120 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 281 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
121 } 282 }
122 }, 283 },
123 SDL_KEYUP() => sub { 284 SDL_KEYUP() => sub {
124 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 285 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
125 }, 286 },
126 SDL_MOUSEMOTION() => sub { 287 SDL_MOUSEMOTION() => sub {
127 warn "sdl motion\n";#d# 288 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
128 }, 289 },
129 SDL_MOUSEBUTTONDOWN() => sub { 290 SDL_MOUSEBUTTONDOWN() => sub {
130 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 291 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
131 }, 292 },
132 SDL_MOUSEBUTTONUP() => sub { 293 SDL_MOUSEBUTTONUP() => sub {
133 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 294 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
134 }, 295 },
135 SDL_ACTIVEEVENT() => sub { 296 SDL_ACTIVEEVENT() => sub {
136 warn "active\n";#d# 297# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
137 }, 298 },
138); 299);
139 300
140@conn::ISA = Crossfire::Protocol::; 301@conn::ISA = Crossfire::Protocol::;
141 302
142sub conn::map_update { 303sub conn::map_update {
143 my ($self, $dirty) = @_; 304 my ($self, $dirty) = @_;
144 305
145 refresh; 306 $MAPWIDGET->update;
146} 307}
147 308
148sub conn::map_scroll { 309sub conn::map_scroll {
149 my ($self, $dx, $dy) = @_; 310 my ($self, $dx, $dy) = @_;
150 311
151 refresh; 312# refresh;
152} 313}
153 314
154sub conn::map_clear { 315sub conn::map_clear {
155 my ($self) = @_; 316 my ($self) = @_;
156 317
157 refresh; 318# refresh;
158} 319}
159 320
160sub conn::face_find { 321sub conn::face_find {
161 my ($self, $face) = @_; 322 my ($self, $face) = @_;
162 323
166sub conn::face_update { 327sub conn::face_update {
167 my ($self, $face) = @_; 328 my ($self, $face) = @_;
168 329
169 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 330 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
170 331
171 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 332 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
333}
334
335sub conn::query {
336 my ($self, $flags, $prompt) = @_;
337
338 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
172} 339}
173 340
174sub gtk_add_cfg_field { 341sub gtk_add_cfg_field {
175 my ($tbl, $cfg, $klbl, $key, $value) = @_; 342 my ($tbl, $cfg, $klbl, $key, $value) = @_;
176 my $i = $cfg->{_i}++; 343 my $i = $cfg->{_i}++;
182 } 349 }
183 $ent->set_text ($value); 350 $ent->set_text ($value);
184 $ent->signal_connect (changed => sub { 351 $ent->signal_connect (changed => sub {
185 my ($ent) = @_; 352 my ($ent) = @_;
186 $cfg->{$key} = $ent->get_text; 353 $cfg->{$key} = $ent->get_text;
354 # TODO: Mapsize should be a slider in the game gui
355 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
356 $cfg->{$key} = 100;
357 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
358 $cfg->{$key} = 50;
359 }
187 }); 360 });
188} 361}
189 362
190sub run_config_dialog { 363sub run_config_dialog {
191 my (%events) = @_; 364 my (%events) = @_;
193 my $w = Gtk2::Window->new; 366 my $w = Gtk2::Window->new;
194 367
195 my @cfg = ( 368 my @cfg = (
196 [qw/Host host/], 369 [qw/Host host/],
197 [qw/Port port/], 370 [qw/Port port/],
371 [qw/Mapsize% mapsize/],
198 [qw/Username user/], 372 [qw/Username user/],
199 [qw/Password password/], 373 [qw/Password password/],
200 ); 374 );
201 375
202 my $cfg = {}; 376 my $cfg = {};
203
204 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
205 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
206 377
207 $w->add (my $vb = Gtk2::VBox->new); 378 $w->add (my $vb = Gtk2::VBox->new);
208 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 379 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
209 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 380 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
210 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 381 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
211 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 382 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
212 my $i = 0; 383 my $i = 0;
213 my $act = 0; 384 my $act = 0;
214 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 385 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
215 if ($_ eq $selmode) { $act = $i } 386 if ($_ eq $selmode) { $act = $i }
216 $cb->append_text ($_); 387 $cb->append_text ($_);
217 $i++; 388 $i++;
218 } 389 }
219 $cb->set_active ($act); 390 $cb->set_active ($act);
236 $cb->signal_connect (clicked => sub { 407 $cb->signal_connect (clicked => sub {
237 for (keys %$cfg) { 408 for (keys %$cfg) {
238 $::CFG->{$_} = $cfg->{$_} 409 $::CFG->{$_} = $cfg->{$_}
239 if $_ ne '_i'; 410 if $_ ne '_i';
240 } 411 }
241 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 412 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
242 }); 413 });
243 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 414 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
244 $cb->signal_connect (clicked => sub { 415 $cb->signal_connect (clicked => sub {
245 for (keys %$cfg) { 416 for (keys %$cfg) {
246 $::CFG->{$_} = $cfg->{$_} 417 $::CFG->{$_} = $cfg->{$_}
249 my $cb = $events{login} || sub {}; 420 my $cb = $events{login} || sub {};
250 $cb->($::CFG->{user}, $::CFG->{password}); 421 $cb->($::CFG->{user}, $::CFG->{password});
251 }); 422 });
252 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 423 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
253 $cb->signal_connect (clicked => sub { 424 $cb->signal_connect (clicked => sub {
254 my $cb = $events{login} || sub {}; 425 my $cb = $events{logout} || sub {};
255 $cb->(); 426 $cb->();
256 }); 427 });
257 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 428 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
258 $cb->signal_connect (clicked => sub { $w->destroy }); 429 $cb->signal_connect (clicked => sub { $w->destroy });
259 430
265 436
266############################################################################# 437#############################################################################
267 438
268SDL::Init SDL_INIT_EVERYTHING; 439SDL::Init SDL_INIT_EVERYTHING;
269 440
270my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 441@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
442 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
271 443
272$mapwidget->activate;
273$mapwidget->focus_in;
274
275Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 444CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
276 445
277$CFG ||= { 446$CFG ||= {
278 width => 640, 447 width => 640,
279 height => 480, 448 height => 480,
449 mapsize => 100,
280 fullscreen => 0, 450 fullscreen => 0,
281 host => "crossfire.schmorp.de", 451 host => "crossfire.schmorp.de",
282 port => 13327, 452 port => 13327,
283}; 453};
284 454
455{
456 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
457
458 CFClient::add_font $_ for @fonts;
459 CFClient::set_font $fonts[0];
460}
461
285$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 462$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
286
287SDL::TTFInit;
288
289$GUIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", 12
290 or die "TTFOpenFont: $!";
291 463
292run_config_dialog 464run_config_dialog
293 login => sub { start_game }, 465 login => sub { start_game },
294 logout => sub { stop_game }; 466 logout => sub { stop_game };
295 467

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines