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.34 by elmex, Sat Apr 8 18:18:09 2006 UTC vs.
Revision 1.66 by root, Tue Apr 11 13:05:12 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;
32our $HEIGHT; 33our $HEIGHT;
33our $FULLSCREEN; 34our $FULLSCREEN;
34 35
35our $UIFONT; 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
47my $last_refresh;
48my %ANIMATE;
49my $refresh_handler;
50
46our $tw; # Test widget #d# 51our ($tw, $te); # Test widget #d#
47 52
48sub init_screen { 53sub init_screen {
49 $SDL_APP = new SDL::App 54 $SDL_APP = new SDL::App
50 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
51 -title => "Crossfire+ Client", 56 -title => "Crossfire+ Client",
52 -width => $WIDTH, 57 -width => $WIDTH,
53 -height => $HEIGHT, 58 -height => $HEIGHT,
54 -opengl => 1, 59 -opengl => 1,
55 -red_size => 8, 60 -red_size => 5,
56 -green_size => 8, 61 -green_size => 5,
57 -blue_size => 8, 62 -blue_size => 5,
63 -alpha_size => 0,
58 -double_buffer => 1, 64 -double_buffer => 1,
59 -fullscreen => $FULLSCREEN, 65 -fullscreen => $FULLSCREEN,
60 -resizeable => 0; 66 -resizeable => 0;
61 67
62 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 68 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1);
63 70
64 $GL_EXT{GL_ARB_texture_non_power_of_two} 71 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
65 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;
66 74
67 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40 75 1
68 or die "TTFOpenFont: $!"; 76 };
69 77
70 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode"; 78 $last_refresh = SDL::GetTicks;
71 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
72 $ALT_ENTER_MESSAGE->activate;
73 79
74 # Test code #d# 80 Crossfire::Client::gl_init;
75 $tw = new Crossfire::Client::Widget::Window;
76 $tw->add (my $lbl = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!");
77# $tw = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Foo in the garden!";
78 81
79 $tw->move (0, $HEIGHT - 50); 82 $FONTSIZE = int $HEIGHT / 50;
80 $tw->activate;
81 # Test code end #d#
82 83
84 #############################################################################
85
83 glClearColor 0, 0, 0, 0; 86 glClearColor 0.45, 0.45, 0.45, 1;
84 87
85 glEnable GL_TEXTURE_2D; 88 glEnable GL_TEXTURE_2D;
89 glEnable GL_COLOR_MATERIAL;
86 glShadeModel GL_FLAT; 90 glShadeModel GL_FLAT;
87 glDisable GL_DEPTH_TEST; 91 glDisable GL_DEPTH_TEST;
88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 92 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89 93
90 glMatrixMode GL_PROJECTION; 94 #############################################################################
91 glLoadIdentity;
92 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;
93 95
94 glMatrixMode GL_MODELVIEW; 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);
95 103
96 $_->() for @GL_INIT; 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;
97} 147}
98 148
99sub start_game { 149sub start_game {
100 $SDL_TIMER = add Glib::Timeout 1000/100, sub {
101 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
102 while $SDL_EV->poll;
103
104 1
105 };
106
107 $WIDTH = $CFG->{width}; 150 $WIDTH = $CFG->{width};
108 $HEIGHT = $CFG->{height}; 151 $HEIGHT = $CFG->{height};
109 $FULLSCREEN = 0; 152 $FULLSCREEN = 0;
110 153
111 init_screen; 154 init_screen;
155
156 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
112 157
113 $CONN = new conn 158 $CONN = new conn
114 host => $CFG->{host}, 159 host => $CFG->{host},
115 port => $CFG->{port}, 160 port => $CFG->{port},
116 user => $CFG->{user}, 161 user => $CFG->{user},
117 pass => $CFG->{password}; 162 pass => $CFG->{password},
163 mapw => $mapsize,
164 maph => $mapsize,
165 ;
166
167 Crossfire::Client::lowdelay fileno $CONN->{fh};
118} 168}
119 169
120sub stop_game { 170sub stop_game {
121 remove Glib::Source $SDL_TIMER; 171 remove Glib::Source $refresh_handler if $refresh_handler;
172 undef $refresh_handler;
122 173
123 undef $SDL_APP; 174 undef $CONN;
124 SDL::Quit; 175 destroy_screen;
125} 176}
126
127 177
128sub force_refresh { 178sub force_refresh {
129 glViewport 0, 0, $WIDTH, $HEIGHT; 179 glViewport 0, 0, $WIDTH, $HEIGHT;
180
181 glMatrixMode GL_PROJECTION;
182 glLoadIdentity;
183 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
184 glMatrixMode GL_MODELVIEW;
185
130 glClear GL_COLOR_BUFFER_BIT; 186 glClear GL_COLOR_BUFFER_BIT;
131 187
132 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 188 $Crossfire::Client::Widget::TOPLEVEL->draw;
133 189
134 SDL::GLSwapBuffers; 190 SDL::GLSwapBuffers;
135} 191}
136 192
137my $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;
138 200
139sub refresh { 201sub refresh {
140 $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", $FPS;
218 }
219
141 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 {
142 undef $refresh_handler; 230 undef $refresh_handler;
231 0
143 0 232 }
144 }; 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};
145} 247}
146 248
147%SDL_CB = ( 249%SDL_CB = (
148 SDL_QUIT() => sub { 250 SDL_QUIT() => sub {
149 main_quit Gtk2; 251 main_quit Gtk2;
… …
164 }, 266 },
165 SDL_KEYUP() => sub { 267 SDL_KEYUP() => sub {
166 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 268 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
167 }, 269 },
168 SDL_MOUSEMOTION() => sub { 270 SDL_MOUSEMOTION() => sub {
169 warn "sdl motion\n";#d# 271 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV);
170 }, 272 },
171 SDL_MOUSEBUTTONDOWN() => sub { 273 SDL_MOUSEBUTTONDOWN() => sub {
172 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 274 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
173 }, 275 },
174 SDL_MOUSEBUTTONUP() => sub { 276 SDL_MOUSEBUTTONUP() => sub {
175 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 277 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
176 }, 278 },
177 SDL_ACTIVEEVENT() => sub { 279 SDL_ACTIVEEVENT() => sub {
178 warn "active\n";#d# 280 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
179 }, 281 },
180); 282);
181 283
182@conn::ISA = Crossfire::Protocol::; 284@conn::ISA = Crossfire::Protocol::;
183 285
… …
188} 290}
189 291
190sub conn::map_scroll { 292sub conn::map_scroll {
191 my ($self, $dx, $dy) = @_; 293 my ($self, $dx, $dy) = @_;
192 294
193 refresh; 295# refresh;
194} 296}
195 297
196sub conn::map_clear { 298sub conn::map_clear {
197 my ($self) = @_; 299 my ($self) = @_;
198 300
199 refresh; 301# refresh;
200} 302}
201 303
202sub conn::face_find { 304sub conn::face_find {
203 my ($self, $face) = @_; 305 my ($self, $face) = @_;
204 306
… …
230 } 332 }
231 $ent->set_text ($value); 333 $ent->set_text ($value);
232 $ent->signal_connect (changed => sub { 334 $ent->signal_connect (changed => sub {
233 my ($ent) = @_; 335 my ($ent) = @_;
234 $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 }
235 }); 343 });
236} 344}
237 345
238sub run_config_dialog { 346sub run_config_dialog {
239 my (%events) = @_; 347 my (%events) = @_;
… …
241 my $w = Gtk2::Window->new; 349 my $w = Gtk2::Window->new;
242 350
243 my @cfg = ( 351 my @cfg = (
244 [qw/Host host/], 352 [qw/Host host/],
245 [qw/Port port/], 353 [qw/Port port/],
354 [qw/Mapsize% mapsize/],
246 [qw/Username user/], 355 [qw/Username user/],
247 [qw/Password password/], 356 [qw/Password password/],
248 ); 357 );
249 358
250 my $cfg = {}; 359 my $cfg = {};
… …
297 my $cb = $events{login} || sub {}; 406 my $cb = $events{login} || sub {};
298 $cb->($::CFG->{user}, $::CFG->{password}); 407 $cb->($::CFG->{user}, $::CFG->{password});
299 }); 408 });
300 $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);
301 $cb->signal_connect (clicked => sub { 410 $cb->signal_connect (clicked => sub {
302 my $cb = $events{login} || sub {}; 411 my $cb = $events{logout} || sub {};
303 $cb->(); 412 $cb->();
304 }); 413 });
305 $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);
306 $cb->signal_connect (clicked => sub { $w->destroy }); 415 $cb->signal_connect (clicked => sub { $w->destroy });
307 416
… …
312 421
313 422
314############################################################################# 423#############################################################################
315 424
316SDL::Init SDL_INIT_EVERYTHING; 425SDL::Init SDL_INIT_EVERYTHING;
317SDL::TTFInit;
318 426
319my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 427my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
320 428
321$mapwidget->activate; 429$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
322$mapwidget->focus_in; 430$mapwidget->focus_in;
323 431
324Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 432Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
325 433
326$CFG ||= { 434$CFG ||= {
327 width => 640, 435 width => 640,
328 height => 480, 436 height => 480,
437 mapsize => 100,
329 fullscreen => 0, 438 fullscreen => 0,
330 host => "crossfire.schmorp.de", 439 host => "crossfire.schmorp.de",
331 port => 13327, 440 port => 13327,
332}; 441};
333 442
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}
449
334$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 450$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
335 451
336run_config_dialog 452run_config_dialog
337 login => sub { start_game }, 453 login => sub { start_game },
338 logout => sub { stop_game }; 454 logout => sub { stop_game };

Diff Legend

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