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.42 by root, Sun Apr 9 01:35:40 2006 UTC vs.
Revision 1.65 by root, Tue Apr 11 12:27:51 2006 UTC

… …
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol;
18
17use Crossfire::Client; 19use Crossfire::Client;
18use Crossfire::Protocol;
19
20use Crossfire::Client::Widget; 20use Crossfire::Client::Widget;
21 21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 30;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26
22our $FACECACHE; 27our $FACECACHE;
23
24our $VERSION = '0.1';
25
26our %GL_EXT;
27 28
28our $CFG; 29our $CFG;
29our $CONN; 30our $CONN;
30 31
31our $WIDTH; 32our $WIDTH;
… …
34 35
35our $FONTSIZE; 36our $FONTSIZE;
36 37
37our $SDL_TIMER; 38our $SDL_TIMER;
38our $SDL_APP; 39our $SDL_APP;
39our $SDL_EV = new SDL::Event; 40our $SDL_EV;
40our %SDL_CB; 41our %SDL_CB;
41 42
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 43our $ALT_ENTER_MESSAGE;
44our $STATUS_LINE;
45our $DEBUG_STATUS;
45 46
46our $TOPLEVEL; 47my $last_refresh;
48my %ANIMATE;
49my $refresh_handler;
47 50
48our $tw; # Test widget #d# 51our ($tw, $te); # Test widget #d#
49 52
50sub init_screen { 53sub init_screen {
51 $SDL_APP = new SDL::App 54 $SDL_APP = new SDL::App
52 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
53 -title => "Crossfire+ Client", 56 -title => "Crossfire+ Client",
54 -width => $WIDTH, 57 -width => $WIDTH,
55 -height => $HEIGHT, 58 -height => $HEIGHT,
56 -opengl => 1, 59 -opengl => 1,
57 -red_size => 8, 60 -red_size => 5,
58 -green_size => 8, 61 -green_size => 5,
59 -blue_size => 8, 62 -blue_size => 5,
63 -alpha_size => 0,
60 -double_buffer => 1, 64 -double_buffer => 1,
61 -fullscreen => $FULLSCREEN, 65 -fullscreen => $FULLSCREEN,
62 -resizeable => 0; 66 -resizeable => 0;
63 67
64 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 68 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1);
65 70
66 $GL_EXT{GL_ARB_texture_non_power_of_two} 71 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
67 or warn "WARNING: non-power-of-two opengl extension required"; 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 Crossfire::Client::gl_init;
68 81
69 $FONTSIZE = int $HEIGHT / 50; 82 $FONTSIZE = int $HEIGHT / 50;
70 83
71 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 84 #############################################################################
72 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE,
73 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
74 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
75 $TOPLEVEL->add ($ALT_ENTER_MESSAGE);
76 85
77 # Test code #d#
78 {
79 my $frm = new Crossfire::Client::Widget::Frame;
80 $tw = new Crossfire::Client::Widget::Window;
81 $frm->add (my $te = new Crossfire::Client::Widget::TextEntry 0, 0, 10, $FONTSIZE, "Foo in the garden!");
82 $tw->add ($frm);
83
84 $tw->move (0, $HEIGHT - 120);
85 $TOPLEVEL->add ($tw);
86# $te->focus_in;
87 }
88
89 glClearColor 0, 0, 0, 0; 86 glClearColor 0.45, 0.45, 0.45, 1;
90 87
91 glEnable GL_TEXTURE_2D; 88 glEnable GL_TEXTURE_2D;
92 glEnable GL_COLOR_MATERIAL; 89 glEnable GL_COLOR_MATERIAL;
93 glShadeModel GL_FLAT; 90 glShadeModel GL_FLAT;
94 glDisable GL_DEPTH_TEST; 91 glDisable GL_DEPTH_TEST;
95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 92 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96 93
97 $_->() for @GL_INIT; 94 #############################################################################
95
96 $DEBUG_STATUS = new Crossfire::Client::Widget::Label 0, 0, 1, $FONTSIZE, "";
97 $Crossfire::Client::Widget::TOPLEVEL->add ($DEBUG_STATUS);
98
99 $STATUS_LINE = new Crossfire::Client::Widget::Label
100 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
101 "";
102 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE);
103
104 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
105 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
106 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
107 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
108
109 # Test code #d#
110 unless ($tw) { # haha...
111 $te = new Crossfire::Client::Widget::FancyFrame;
112 $te->add (new Crossfire::Client::Widget::Entry);
113 $te->move (300, 0, 2);
114 $Crossfire::Client::Widget::TOPLEVEL->add ($te);
115
116 $tw = new Crossfire::Client::Widget::Animator;
117 my $lbl1 = new Crossfire::Client::Widget::Label
118 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
119 my $lbl2 = new Crossfire::Client::Widget::Label
120 0, 0, 10, $FONTSIZE, "LBL2";
121
122 my $vb = new Crossfire::Client::Widget::VBox;
123 my $f = new Crossfire::Client::Widget::FancyFrame;
124 my $f2 = new Crossfire::Client::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 $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
136
137# $f->move ($WIDTH - 200, 0);
138# $Crossfire::Client::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;
98} 147}
99 148
100sub start_game { 149sub start_game {
101 $SDL_TIMER = add Glib::Timeout 1000/100, sub {
102 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
103 while $SDL_EV->poll;
104
105 1
106 };
107
108 $WIDTH = $CFG->{width}; 150 $WIDTH = $CFG->{width};
109 $HEIGHT = $CFG->{height}; 151 $HEIGHT = $CFG->{height};
110 $FULLSCREEN = 0; 152 $FULLSCREEN = 0;
111 153
112 init_screen; 154 init_screen;
155
156 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
113 157
114 $CONN = new conn 158 $CONN = new conn
115 host => $CFG->{host}, 159 host => $CFG->{host},
116 port => $CFG->{port}, 160 port => $CFG->{port},
117 user => $CFG->{user}, 161 user => $CFG->{user},
118 pass => $CFG->{password}, 162 pass => $CFG->{password},
119 mapw => 50, 163 mapw => $mapsize,
120 maph => 37, 164 maph => $mapsize,
121 ; 165 ;
166
167 Crossfire::Client::lowdelay fileno $CONN->{fh};
122} 168}
123 169
124sub stop_game { 170sub stop_game {
125 remove Glib::Source $SDL_TIMER; 171 remove Glib::Source $refresh_handler if $refresh_handler;
172 undef $refresh_handler;
126 173
127 undef $SDL_APP; 174 undef $CONN;
128 SDL::Quit; 175 destroy_screen;
129} 176}
130
131 177
132sub force_refresh { 178sub force_refresh {
133 glViewport 0, 0, $WIDTH, $HEIGHT; 179 glViewport 0, 0, $WIDTH, $HEIGHT;
134 180
135 glMatrixMode GL_PROJECTION; 181 glMatrixMode GL_PROJECTION;
136 glLoadIdentity; 182 glLoadIdentity;
137 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100; 183 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
138 glMatrixMode GL_MODELVIEW; 184 glMatrixMode GL_MODELVIEW;
139 185
140 glClear GL_COLOR_BUFFER_BIT; 186 glClear GL_COLOR_BUFFER_BIT;
141 187
142 $TOPLEVEL->draw; 188 $Crossfire::Client::Widget::TOPLEVEL->draw;
143 189
144 SDL::GLSwapBuffers; 190 SDL::GLSwapBuffers;
145} 191}
146 192
147my $refresh_handler; 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;
148 200
149sub refresh { 201sub refresh {
150 $refresh_handler ||= add Glib::Idle sub { 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\n", $FPS;
218 }
219
151 force_refresh; 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 {
152 undef $refresh_handler; 230 undef $refresh_handler;
231 0
153 0 232 }
154 }; 233 };
234}
235
236sub animation_start {
237 my ($widget) = @_;
238 $ANIMATE{$widget} = $widget;
239 Scalar::Util::weaken $ANIMATE{$widget};
240
241 refresh;
242}
243
244sub animation_stop {
245 my ($widget) = @_;
246 delete $ANIMATE{$widget};
155} 247}
156 248
157%SDL_CB = ( 249%SDL_CB = (
158 SDL_QUIT() => sub { 250 SDL_QUIT() => sub {
159 main_quit Gtk2; 251 main_quit Gtk2;
… …
174 }, 266 },
175 SDL_KEYUP() => sub { 267 SDL_KEYUP() => sub {
176 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 268 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
177 }, 269 },
178 SDL_MOUSEMOTION() => sub { 270 SDL_MOUSEMOTION() => sub {
179 warn "sdl motion\n";#d# 271 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV);
180 }, 272 },
181 SDL_MOUSEBUTTONDOWN() => sub { 273 SDL_MOUSEBUTTONDOWN() => sub {
182 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 274 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
183 }, 275 },
184 SDL_MOUSEBUTTONUP() => sub { 276 SDL_MOUSEBUTTONUP() => sub {
185 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 277 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
186 }, 278 },
187 SDL_ACTIVEEVENT() => sub { 279 SDL_ACTIVEEVENT() => sub {
188 warn "active\n";#d# 280 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
189 }, 281 },
190); 282);
191 283
192@conn::ISA = Crossfire::Protocol::; 284@conn::ISA = Crossfire::Protocol::;
193 285
… …
198} 290}
199 291
200sub conn::map_scroll { 292sub conn::map_scroll {
201 my ($self, $dx, $dy) = @_; 293 my ($self, $dx, $dy) = @_;
202 294
203 refresh; 295# refresh;
204} 296}
205 297
206sub conn::map_clear { 298sub conn::map_clear {
207 my ($self) = @_; 299 my ($self) = @_;
208 300
209 refresh; 301# refresh;
210} 302}
211 303
212sub conn::face_find { 304sub conn::face_find {
213 my ($self, $face) = @_; 305 my ($self, $face) = @_;
214 306
… …
240 } 332 }
241 $ent->set_text ($value); 333 $ent->set_text ($value);
242 $ent->signal_connect (changed => sub { 334 $ent->signal_connect (changed => sub {
243 my ($ent) = @_; 335 my ($ent) = @_;
244 $cfg->{$key} = $ent->get_text; 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 }
245 }); 343 });
246} 344}
247 345
248sub run_config_dialog { 346sub run_config_dialog {
249 my (%events) = @_; 347 my (%events) = @_;
… …
251 my $w = Gtk2::Window->new; 349 my $w = Gtk2::Window->new;
252 350
253 my @cfg = ( 351 my @cfg = (
254 [qw/Host host/], 352 [qw/Host host/],
255 [qw/Port port/], 353 [qw/Port port/],
354 [qw/Mapsize% mapsize/],
256 [qw/Username user/], 355 [qw/Username user/],
257 [qw/Password password/], 356 [qw/Password password/],
258 ); 357 );
259 358
260 my $cfg = {}; 359 my $cfg = {};
… …
307 my $cb = $events{login} || sub {}; 406 my $cb = $events{login} || sub {};
308 $cb->($::CFG->{user}, $::CFG->{password}); 407 $cb->($::CFG->{user}, $::CFG->{password});
309 }); 408 });
310 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 409 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
311 $cb->signal_connect (clicked => sub { 410 $cb->signal_connect (clicked => sub {
312 my $cb = $events{login} || sub {}; 411 my $cb = $events{logout} || sub {};
313 $cb->(); 412 $cb->();
314 }); 413 });
315 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 414 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
316 $cb->signal_connect (clicked => sub { $w->destroy }); 415 $cb->signal_connect (clicked => sub { $w->destroy });
317 416
… …
323 422
324############################################################################# 423#############################################################################
325 424
326SDL::Init SDL_INIT_EVERYTHING; 425SDL::Init SDL_INIT_EVERYTHING;
327 426
328$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;
329
330my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 427my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
331 428
332$TOPLEVEL->add ($mapwidget); 429$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
333$mapwidget->focus_in; 430$mapwidget->focus_in;
334 431
335Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 432Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
336 433
337$CFG ||= { 434$CFG ||= {
338 width => 640, 435 width => 640,
339 height => 480, 436 height => 480,
437 mapsize => 100,
340 fullscreen => 0, 438 fullscreen => 0,
341 host => "crossfire.schmorp.de", 439 host => "crossfire.schmorp.de",
342 port => 13327, 440 port => 13327,
343}; 441};
344 442
345Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf"; 443{
444 my @fonts = map Crossfire::Client::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
445
446 Crossfire::Client::add_font $_ for @fonts;
447 Crossfire::Client::set_font $fonts[0];
448}
346 449
347$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 450$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
348 451
349run_config_dialog 452run_config_dialog
350 login => sub { start_game }, 453 login => sub { start_game },

Diff Legend

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