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.23 by elmex, Fri Apr 7 20:15:01 2006 UTC vs.
Revision 1.79 by root, Wed Apr 12 00:36: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
32our @SDL_MODES;
33our $WIDTH;
34our $HEIGHT;
35our $FULLSCREEN;
36
37our $NOW;
38
39our $MAPWIDGET;
40our $FONTSIZE;
41
28our $SDL_TIMER; 42our $SDL_TIMER;
29our $SDL_APP; 43our $SDL_APP;
30our $SDL_EV = new SDL::Event; 44our $SDL_EV;
31our %SDL_CB; 45our %SDL_CB;
32 46
33our @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#
34 56
35sub init_screen { 57sub init_screen {
36 $SDL_APP = new SDL::App 58 $SDL_APP = new SDL::App
37 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
38 -title => "Crossfire+ Client", 60 -title => "Crossfire+ Client",
39 -width => $CFG->{width}, 61 -width => $WIDTH,
40 -height => $CFG->{height}, 62 -height => $HEIGHT,
41 -opengl => 1, 63 -opengl => 1,
42 -red_size => 8, 64 -red_size => 5,
43 -green_size => 8, 65 -green_size => 5,
44 -blue_size => 8, 66 -blue_size => 5,
67 -alpha_size => 0,
45 -double_buffer => 1, 68 -double_buffer => 1,
46 -fullscreen => $CFG->{fullscreen}, 69 -fullscreen => $FULLSCREEN,
47 -resizeable => 0; 70 -resizeable => 0;
48 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 / 40;
87
88 #############################################################################
89
49 glClearColor 0, 0, 0, 0; 90 glClearColor 0.45, 0.45, 0.45, 1;
50 91
51 glEnable GL_TEXTURE_2D; 92 glEnable GL_TEXTURE_2D;
52 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 93 glEnable GL_COLOR_MATERIAL;
53 glShadeModel GL_FLAT; 94 glShadeModel GL_FLAT;
54 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
55 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
56 glEnable GL_BLEND; 97
98 #############################################################################
99
100 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
102
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
196 host => $CFG->{host},
197 port => $CFG->{port},
198 user => $CFG->{user},
199 pass => $CFG->{password},
200 mapw => $mapsize,
201 maph => $mapsize,
202 ;
203
204 CFClient::lowdelay fileno $CONN->{fh};
205}
206
207sub stop_game {
208 remove Glib::Source $refresh_handler if $refresh_handler;
209 undef $refresh_handler;
210
211 undef $CONN;
212 destroy_screen;
213}
214
215sub force_refresh {
216 glViewport 0, 0, $WIDTH, $HEIGHT;
57 217
58 glMatrixMode GL_PROJECTION; 218 glMatrixMode GL_PROJECTION;
59 glLoadIdentity; 219 glLoadIdentity;
60 glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100; 220 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
61
62 glMatrixMode GL_MODELVIEW; 221 glMatrixMode GL_MODELVIEW;
222 glLoadIdentity;
63 223
64 $_->() for @GL_INIT; 224 glClear GL_COLOR_BUFFER_BIT;
65}
66 225
67sub start_game { 226 $CFClient::UI::TOPLEVEL->draw;
68 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 227
69 while ($SDL_EV->poll) { 228 SDL::GLSwapBuffers;
70 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 229}
230
231sub debug {
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}
236
237my $FPS;
238
239sub refresh {
240 $refresh_handler ||= add Glib::Idle sub {
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
71 } 270 }
72
73 1
74 }; 271 };
75
76 init_screen;
77
78 $CONN = new conn
79 host => $CFG->{host},
80 port => $CFG->{port};
81} 272}
82 273
83sub stop_game { 274sub animation_start {
84 remove Glib::Source $SDL_TIMER; 275 my ($widget) = @_;
276 $ANIMATE{$widget} = $widget;
277 Scalar::Util::weaken $ANIMATE{$widget};
85 278
86 undef $SDL_APP; 279 refresh;
87 SDL::Quit;
88} 280}
89 281
90sub refresh { 282sub animation_stop {
91 glClear GL_COLOR_BUFFER_BIT; 283 my ($widget) = @_;
92 284 delete $ANIMATE{$widget};
93 $_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS;
94
95 SDL::GLSwapBuffers;
96} 285}
97 286
98%SDL_CB = ( 287%SDL_CB = (
99 SDL_QUIT() => sub { 288 SDL_QUIT() => sub {
100 main_quit Gtk2; 289 main_quit Gtk2;
105 refresh; 294 refresh;
106 }, 295 },
107 SDL_KEYDOWN() => sub { 296 SDL_KEYDOWN() => sub {
108 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 297 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
109 # alt-enter 298 # alt-enter
110 $CFG->{fullscreen} = !$CFG->{fullscreen}; 299 $FULLSCREEN = !$FULLSCREEN;
111 init_screen; 300 init_screen;
112 } else { 301 } else {
113 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 302 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
114 } 303 }
115 }, 304 },
116 SDL_KEYUP() => sub { 305 SDL_KEYUP() => sub {
117 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 306 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
118 }, 307 },
119 SDL_MOUSEMOTION() => sub { 308 SDL_MOUSEMOTION() => sub {
120 warn "sdl motion\n";#d# 309 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
121 }, 310 },
122 SDL_MOUSEBUTTONDOWN() => sub { 311 SDL_MOUSEBUTTONDOWN() => sub {
123 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 312 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
124 }, 313 },
125 SDL_MOUSEBUTTONUP() => sub { 314 SDL_MOUSEBUTTONUP() => sub {
126 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 315 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
127 }, 316 },
128 SDL_ACTIVEEVENT() => sub { 317 SDL_ACTIVEEVENT() => sub {
129 warn "active\n";#d# 318# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
130 }, 319 },
131); 320);
132 321
133@conn::ISA = Crossfire::Protocol::; 322@conn::ISA = Crossfire::Protocol::;
134 323
135sub conn::map_update { 324sub conn::map_update {
136 my ($self, $dirty) = @_; 325 my ($self, $dirty) = @_;
137 326
138 refresh; 327 $MAPWIDGET->update;
139} 328}
140 329
141sub conn::map_scroll { 330sub conn::map_scroll {
142 my ($self, $dx, $dy) = @_; 331 my ($self, $dx, $dy) = @_;
143 332
144 refresh; 333# refresh;
145} 334}
146 335
147sub conn::map_clear { 336sub conn::map_clear {
148 my ($self) = @_; 337 my ($self) = @_;
149 338
150 refresh; 339# refresh;
151} 340}
152 341
153sub conn::face_find { 342sub conn::face_find {
154 my ($self, $face) = @_; 343 my ($self, $face) = @_;
155 344
159sub conn::face_update { 348sub conn::face_update {
160 my ($self, $face) = @_; 349 my ($self, $face) = @_;
161 350
162 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 351 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
163 352
164 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 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#
165} 360}
166 361
167sub gtk_add_cfg_field { 362sub gtk_add_cfg_field {
168 my ($tbl, $cfg, $klbl, $key, $value) = @_; 363 my ($tbl, $cfg, $klbl, $key, $value) = @_;
169 my $i = $cfg->{_i}++; 364 my $i = $cfg->{_i}++;
175 } 370 }
176 $ent->set_text ($value); 371 $ent->set_text ($value);
177 $ent->signal_connect (changed => sub { 372 $ent->signal_connect (changed => sub {
178 my ($ent) = @_; 373 my ($ent) = @_;
179 $cfg->{$key} = $ent->get_text; 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 }
180 }); 381 });
181} 382}
182 383
183sub run_config_dialog { 384sub run_config_dialog {
184 my (%events) = @_; 385 my (%events) = @_;
186 my $w = Gtk2::Window->new; 387 my $w = Gtk2::Window->new;
187 388
188 my @cfg = ( 389 my @cfg = (
189 [qw/Host host/], 390 [qw/Host host/],
190 [qw/Port port/], 391 [qw/Port port/],
392 [qw/Mapsize% mapsize/],
191 [qw/Username user/], 393 [qw/Username user/],
192 [qw/Password password/], 394 [qw/Password password/],
193 ); 395 );
194 396
195 my $cfg = {}; 397 my $cfg = {};
196
197 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
198 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
199 398
200 $w->add (my $vb = Gtk2::VBox->new); 399 $w->add (my $vb = Gtk2::VBox->new);
201 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 400 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
202 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 401 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
203 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 402 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
204 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 403 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
205 my $i = 0; 404 my $i = 0;
206 my $act = 0; 405 my $act = 0;
207 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 406 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
208 if ($_ eq $selmode) { $act = $i } 407 if ($_ eq $selmode) { $act = $i }
209 $cb->append_text ($_); 408 $cb->append_text ($_);
210 $i++; 409 $i++;
211 } 410 }
212 $cb->set_active ($act); 411 $cb->set_active ($act);
229 $cb->signal_connect (clicked => sub { 428 $cb->signal_connect (clicked => sub {
230 for (keys %$cfg) { 429 for (keys %$cfg) {
231 $::CFG->{$_} = $cfg->{$_} 430 $::CFG->{$_} = $cfg->{$_}
232 if $_ ne '_i'; 431 if $_ ne '_i';
233 } 432 }
234 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 433 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
235 }); 434 });
236 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 435 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
237 $cb->signal_connect (clicked => sub { 436 $cb->signal_connect (clicked => sub {
238 for (keys %$cfg) { 437 for (keys %$cfg) {
239 $::CFG->{$_} = $cfg->{$_} 438 $::CFG->{$_} = $cfg->{$_}
242 my $cb = $events{login} || sub {}; 441 my $cb = $events{login} || sub {};
243 $cb->($::CFG->{user}, $::CFG->{password}); 442 $cb->($::CFG->{user}, $::CFG->{password});
244 }); 443 });
245 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 444 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
246 $cb->signal_connect (clicked => sub { 445 $cb->signal_connect (clicked => sub {
247 my $cb = $events{login} || sub {}; 446 my $cb = $events{logout} || sub {};
248 $cb->(); 447 $cb->();
249 }); 448 });
250 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 449 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
251 $cb->signal_connect (clicked => sub { $w->destroy }); 450 $cb->signal_connect (clicked => sub { $w->destroy });
252 451
256} 455}
257 456
258 457
259############################################################################# 458#############################################################################
260 459
261SDL::Init(SDL_INIT_EVERYTHING()); 460SDL::Init SDL_INIT_EVERYTHING;
262 461
263my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 462@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
463 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
264 464
265find_rcfile "uifont.ttf";
266
267$mapwidget->activate;
268$mapwidget->focus_in;
269
270Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 465CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
271
272$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
273 466
274$CFG ||= { 467$CFG ||= {
275 width => 640, 468 width => 640,
276 height => 480, 469 height => 480,
470 mapsize => 100,
277 fullscreen => 0, 471 fullscreen => 0,
278 host => "crossfire.schmorp.de", 472 host => "crossfire.schmorp.de",
279 port => 13327, 473 port => 13327,
280}; 474};
281 475
476{
477 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
478
479 CFClient::add_font $_ for @fonts;
480 CFClient::set_font $fonts[0];
481}
482
483$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
484
282run_config_dialog 485run_config_dialog
283 login => sub { start_game }, 486 login => sub { start_game },
284 logout => sub { stop_game }; 487 logout => sub { stop_game };
285 488
286main Gtk2; 489main Gtk2;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines