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.15 by elmex, Fri Apr 7 17:18:22 2006 UTC vs.
Revision 1.67 by root, Tue Apr 11 13:14:36 2006 UTC

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

Diff Legend

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