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.28 by root, Fri Apr 7 22:11:10 2006 UTC vs.
Revision 1.68 by root, Tue Apr 11 13:38:22 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::Client;
18use Crossfire::Protocol; 17use Crossfire::Protocol;
19 18
20use Crossfire::Client::Util; 19use CFClient;
21use Crossfire::Client::Widget; 20use CFClient::Widget;
21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 30;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
22 26
23our $FACECACHE; 27our $FACECACHE;
24
25our $VERSION = '0.1';
26 28
27our $CFG; 29our $CFG;
28our $CONN; 30our $CONN;
29 31
32our $WIDTH;
33our $HEIGHT;
34our $FULLSCREEN;
35
30our $UIFONT; 36our $FONTSIZE;
31 37
32our $SDL_TIMER; 38our $SDL_TIMER;
33our $SDL_APP; 39our $SDL_APP;
34our $SDL_EV = new SDL::Event; 40our $SDL_EV;
35our %SDL_CB; 41our %SDL_CB;
36 42
37our @GL_INIT; # hooks called on every gl init 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#
38 52
39sub init_screen { 53sub init_screen {
40 $SDL_APP = new SDL::App 54 $SDL_APP = new SDL::App
41 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
42 -title => "Crossfire+ Client", 56 -title => "Crossfire+ Client",
43 -width => $CFG->{width}, 57 -width => $WIDTH,
44 -height => $CFG->{height}, 58 -height => $HEIGHT,
45 -opengl => 1, 59 -opengl => 1,
46 -red_size => 8, 60 -red_size => 5,
47 -green_size => 8, 61 -green_size => 5,
48 -blue_size => 8, 62 -blue_size => 5,
63 -alpha_size => 0,
49 -double_buffer => 1, 64 -double_buffer => 1,
50 -fullscreen => $CFG->{fullscreen}, 65 -fullscreen => $FULLSCREEN,
51 -resizeable => 0; 66 -resizeable => 0;
52 67
53 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $CFG->{height} / 40 68 $SDL_EV = new SDL::Event;
54 or die "TTFOpenFont: $!"; 69 $SDL_EV->set_unicode (1);
55 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
56 glClearColor 0, 0, 0, 0; 86 glClearColor 0.45, 0.45, 0.45, 1;
57 87
58 glEnable GL_TEXTURE_2D; 88 glEnable GL_TEXTURE_2D;
89 glEnable GL_COLOR_MATERIAL;
59 glShadeModel GL_FLAT; 90 glShadeModel GL_FLAT;
60 glDisable GL_DEPTH_TEST; 91 glDisable GL_DEPTH_TEST;
61 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 92 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
62 93
63 glMatrixMode GL_PROJECTION; 94 #############################################################################
64 glLoadIdentity;
65 glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100;
66 95
67 glMatrixMode GL_MODELVIEW; 96 $DEBUG_STATUS = new CFClient::Widget::Label;
97 $CFClient::Widget::TOPLEVEL->add ($DEBUG_STATUS);
98
99 $STATUS_LINE = new CFClient::Widget::Label
100 y => $HEIGHT * 59 / 60 - $FONTSIZE;
101 $CFClient::Widget::TOPLEVEL->add ($STATUS_LINE);
68 102
69 $_->() for @GL_INIT; 103 $ALT_ENTER_MESSAGE = new CFClient::Widget::Label
70} 104 y => $HEIGHT * 59 / 60,
105 height => $HEIGHT / 60,
106 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
107 $CFClient::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
71 108
72my $label;#d# 109 # Test code #d#
110 unless ($tw) { # haha...
111 $te = new CFClient::Widget::FancyFrame x => 300, z => 1;
112 $te->add (new CFClient::Widget::Entry);
113 $CFClient::Widget::TOPLEVEL->add ($te);
114
115 $tw = new CFClient::Widget::Animator x => $WIDTH - 200, w => 400, h => 300;
116 my $lbl1 = new CFClient::Widget::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
117 my $lbl2 = new CFClient::Widget::Label text => "LBL2";
118 my $vb = new CFClient::Widget::VBox;
119 my $f = new CFClient::Widget::FancyFrame;
120 my $f2 = new CFClient::Widget::FancyFrame;
121 $f->add ($lbl1);
122 $f2->add ($lbl2);
123 $vb->add ($f);
124 $vb->add ($f2, 1);
125
126 $tw->add ($vb);
127 $tw->moveto (0, 0);
128 $CFClient::Widget::TOPLEVEL->add ($tw);
129
130# $f->move ($WIDTH - 200, 0);
131# $CFClient::Widget::TOPLEVEL->add ($f);
132 }
133}
134
135sub destroy_screen {
136 remove Glib::Source $SDL_TIMER;
137 undef $SDL_APP;
138 undef $SDL_EV;
139 SDL::Quit;
140}
73 141
74sub start_game { 142sub start_game {
75 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 143 $WIDTH = $CFG->{width};
76 while ($SDL_EV->poll) { 144 $HEIGHT = $CFG->{height};
77 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 145 $FULLSCREEN = 0;
78 }
79
80 1
81 };
82 146
83 init_screen; 147 init_screen;
84 148
85 $label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "Testü[]"; 149 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
86 $label->activate;
87 150
88 $CONN = new conn 151 $CONN = new conn
89 host => $CFG->{host}, 152 host => $CFG->{host},
90 port => $CFG->{port}, 153 port => $CFG->{port},
91 user => $CFG->{user}, 154 user => $CFG->{user},
92 pass => $CFG->{password}; 155 pass => $CFG->{password},
156 mapw => $mapsize,
157 maph => $mapsize,
158 ;
159
160 CFClient::lowdelay fileno $CONN->{fh};
93} 161}
94 162
95sub stop_game { 163sub stop_game {
96 remove Glib::Source $SDL_TIMER; 164 remove Glib::Source $refresh_handler if $refresh_handler;
165 undef $refresh_handler;
97 166
98 undef $SDL_APP; 167 undef $CONN;
99 SDL::Quit; 168 destroy_screen;
100} 169}
170
171sub force_refresh {
172 glViewport 0, 0, $WIDTH, $HEIGHT;
173
174 glMatrixMode GL_PROJECTION;
175 glLoadIdentity;
176 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
177 glMatrixMode GL_MODELVIEW;
178
179 glClear GL_COLOR_BUFFER_BIT;
180
181 $CFClient::Widget::TOPLEVEL->draw;
182
183 SDL::GLSwapBuffers;
184}
185
186sub debug {
187 $DEBUG_STATUS->set_text ($_[0]);
188 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
189 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
190}
191
192my $FPS;
101 193
102sub refresh { 194sub refresh {
103 glClear GL_COLOR_BUFFER_BIT; 195 $refresh_handler ||= add Glib::Idle sub {
196 if ($SDL_APP) {
197 my $next_refresh = SDL::GetTicks;
104 198
105 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 199 if ($next_refresh - $last_refresh < $TICKS_PER_FRAME) {
200 SDL::Delay $TICKS_PER_FRAME - ($next_refresh - $last_refresh);
201 $next_refresh = SDL::GetTicks;
202 }
203
204 my $interval = ($next_refresh - $last_refresh) * 0.001;
205 $last_refresh = $next_refresh;
106 206
107 SDL::GLSwapBuffers; 207 if ($interval) {
208 $FPS ||= 1 / $interval;
209 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
210 debug sprintf "%5.02f", $FPS;
211 }
212
213 force_refresh;
214 $_->animate ($interval) for grep $_, values %ANIMATE;
215
216 if (%ANIMATE) {
217 1
218 } else {
219 undef $refresh_handler;
220 0
221 }
222 } else {
223 undef $refresh_handler;
224 0
225 }
226 };
227}
228
229sub animation_start {
230 my ($widget) = @_;
231 $ANIMATE{$widget} = $widget;
232 Scalar::Util::weaken $ANIMATE{$widget};
233
234 refresh;
235}
236
237sub animation_stop {
238 my ($widget) = @_;
239 delete $ANIMATE{$widget};
108} 240}
109 241
110%SDL_CB = ( 242%SDL_CB = (
111 SDL_QUIT() => sub { 243 SDL_QUIT() => sub {
112 main_quit Gtk2; 244 main_quit Gtk2;
… …
117 refresh; 249 refresh;
118 }, 250 },
119 SDL_KEYDOWN() => sub { 251 SDL_KEYDOWN() => sub {
120 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 252 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
121 # alt-enter 253 # alt-enter
122 $CFG->{fullscreen} = !$CFG->{fullscreen}; 254 $FULLSCREEN = !$FULLSCREEN;
123 init_screen; 255 init_screen;
124 } else { 256 } else {
125 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 257 CFClient::Widget::feed_sdl_key_down_event ($SDL_EV);
126 } 258 }
127 }, 259 },
128 SDL_KEYUP() => sub { 260 SDL_KEYUP() => sub {
129 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 261 CFClient::Widget::feed_sdl_key_up_event ($SDL_EV);
130 }, 262 },
131 SDL_MOUSEMOTION() => sub { 263 SDL_MOUSEMOTION() => sub {
132 warn "sdl motion\n";#d# 264 CFClient::Widget::feed_sdl_motion_event ($SDL_EV);
133 }, 265 },
134 SDL_MOUSEBUTTONDOWN() => sub { 266 SDL_MOUSEBUTTONDOWN() => sub {
135 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 267 CFClient::Widget::feed_sdl_button_down_event ($SDL_EV);
136 }, 268 },
137 SDL_MOUSEBUTTONUP() => sub { 269 SDL_MOUSEBUTTONUP() => sub {
138 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 270 CFClient::Widget::feed_sdl_button_up_event ($SDL_EV);
139 }, 271 },
140 SDL_ACTIVEEVENT() => sub { 272 SDL_ACTIVEEVENT() => sub {
141 warn "active\n";#d# 273 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
142 }, 274 },
143); 275);
144 276
145@conn::ISA = Crossfire::Protocol::; 277@conn::ISA = Crossfire::Protocol::;
146 278
… …
151} 283}
152 284
153sub conn::map_scroll { 285sub conn::map_scroll {
154 my ($self, $dx, $dy) = @_; 286 my ($self, $dx, $dy) = @_;
155 287
156 refresh; 288# refresh;
157} 289}
158 290
159sub conn::map_clear { 291sub conn::map_clear {
160 my ($self) = @_; 292 my ($self) = @_;
161 293
162 refresh; 294# refresh;
163} 295}
164 296
165sub conn::face_find { 297sub conn::face_find {
166 my ($self, $face) = @_; 298 my ($self, $face) = @_;
167 299
… …
171sub conn::face_update { 303sub conn::face_update {
172 my ($self, $face) = @_; 304 my ($self, $face) = @_;
173 305
174 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 306 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
175 307
176 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 308 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
309}
310
311sub conn::query {
312 my ($self, $flags, $prompt) = @_;
313
314 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
177} 315}
178 316
179sub gtk_add_cfg_field { 317sub gtk_add_cfg_field {
180 my ($tbl, $cfg, $klbl, $key, $value) = @_; 318 my ($tbl, $cfg, $klbl, $key, $value) = @_;
181 my $i = $cfg->{_i}++; 319 my $i = $cfg->{_i}++;
… …
187 } 325 }
188 $ent->set_text ($value); 326 $ent->set_text ($value);
189 $ent->signal_connect (changed => sub { 327 $ent->signal_connect (changed => sub {
190 my ($ent) = @_; 328 my ($ent) = @_;
191 $cfg->{$key} = $ent->get_text; 329 $cfg->{$key} = $ent->get_text;
330 # TODO: Mapsize should be a slider in the game gui
331 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
332 $cfg->{$key} = 100;
333 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
334 $cfg->{$key} = 50;
335 }
192 }); 336 });
193} 337}
194 338
195sub run_config_dialog { 339sub run_config_dialog {
196 my (%events) = @_; 340 my (%events) = @_;
… …
198 my $w = Gtk2::Window->new; 342 my $w = Gtk2::Window->new;
199 343
200 my @cfg = ( 344 my @cfg = (
201 [qw/Host host/], 345 [qw/Host host/],
202 [qw/Port port/], 346 [qw/Port port/],
347 [qw/Mapsize% mapsize/],
203 [qw/Username user/], 348 [qw/Username user/],
204 [qw/Password password/], 349 [qw/Password password/],
205 ); 350 );
206 351
207 my $cfg = {}; 352 my $cfg = {};
… …
241 $cb->signal_connect (clicked => sub { 386 $cb->signal_connect (clicked => sub {
242 for (keys %$cfg) { 387 for (keys %$cfg) {
243 $::CFG->{$_} = $cfg->{$_} 388 $::CFG->{$_} = $cfg->{$_}
244 if $_ ne '_i'; 389 if $_ ne '_i';
245 } 390 }
246 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 391 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
247 }); 392 });
248 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 393 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
249 $cb->signal_connect (clicked => sub { 394 $cb->signal_connect (clicked => sub {
250 for (keys %$cfg) { 395 for (keys %$cfg) {
251 $::CFG->{$_} = $cfg->{$_} 396 $::CFG->{$_} = $cfg->{$_}
… …
254 my $cb = $events{login} || sub {}; 399 my $cb = $events{login} || sub {};
255 $cb->($::CFG->{user}, $::CFG->{password}); 400 $cb->($::CFG->{user}, $::CFG->{password});
256 }); 401 });
257 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 402 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
258 $cb->signal_connect (clicked => sub { 403 $cb->signal_connect (clicked => sub {
259 my $cb = $events{login} || sub {}; 404 my $cb = $events{logout} || sub {};
260 $cb->(); 405 $cb->();
261 }); 406 });
262 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 407 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
263 $cb->signal_connect (clicked => sub { $w->destroy }); 408 $cb->signal_connect (clicked => sub { $w->destroy });
264 409
… …
269 414
270 415
271############################################################################# 416#############################################################################
272 417
273SDL::Init SDL_INIT_EVERYTHING; 418SDL::Init SDL_INIT_EVERYTHING;
274SDL::TTFInit;
275 419
276my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 420my $mapwidget = CFClient::Widget::MapWidget->new;
277 421
278$mapwidget->activate; 422$CFClient::Widget::TOPLEVEL->add ($mapwidget);
279$mapwidget->focus_in; 423$mapwidget->focus_in;
280 424
281Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 425CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
282 426
283$CFG ||= { 427$CFG ||= {
284 width => 640, 428 width => 640,
285 height => 480, 429 height => 480,
430 mapsize => 100,
286 fullscreen => 0, 431 fullscreen => 0,
287 host => "crossfire.schmorp.de", 432 host => "crossfire.schmorp.de",
288 port => 13327, 433 port => 13327,
289}; 434};
290 435
436{
437 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
438
439 CFClient::add_font $_ for @fonts;
440 CFClient::set_font $fonts[0];
441}
442
291$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 443$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
292 444
293run_config_dialog 445run_config_dialog
294 login => sub { start_game }, 446 login => sub { start_game },
295 logout => sub { stop_game }; 447 logout => sub { stop_game };

Diff Legend

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