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

Diff Legend

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