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.60 by root, Mon Apr 10 11:56:28 2006 UTC vs.
Revision 1.72 by root, Tue Apr 11 18:06:53 2006 UTC

… …
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol; 17use Crossfire::Protocol;
18 18
19use Crossfire::Client; 19use CFClient;
20use Crossfire::Client::Widget; 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 $FONTSIZE; 39our $FONTSIZE;
36 40
37our $SDL_TIMER; 41our $SDL_TIMER;
38our $SDL_APP; 42our $SDL_APP;
39our $SDL_EV; 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;
45our $STATUS_LINE; 47our $STATUS_LINE;
48our $DEBUG_STATUS;
46 49
47my $last_refresh; 50my $last_refresh;
48my %ANIMATE; 51my %ANIMATE;
49my $refresh_handler; 52my $refresh_handler;
50 53
… …
66 -resizeable => 0; 69 -resizeable => 0;
67 70
68 $SDL_EV = new SDL::Event; 71 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1); 72 $SDL_EV->set_unicode (1);
70 73
74 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
75 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
76 while $SDL_EV->poll;
77
78 1
79 };
80
71 $last_refresh = SDL::GetTicks; 81 $last_refresh = SDL::GetTicks;
72 82
73 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 83 CFClient::gl_init;
74
75 $GL_EXT{GL_ARB_texture_non_power_of_two}
76 or warn "WARNING: non-power-of-two opengl extension required";
77 84
78 $FONTSIZE = int $HEIGHT / 50; 85 $FONTSIZE = int $HEIGHT / 50;
79 86
80 ############################################################################# 87 #############################################################################
81 88
82 glClearColor 0.5, 0.5, 0.5, 1; 89 glClearColor 0.45, 0.45, 0.45, 1;
83 90
84 glEnable GL_TEXTURE_2D; 91 glEnable GL_TEXTURE_2D;
85 glEnable GL_COLOR_MATERIAL; 92 glEnable GL_COLOR_MATERIAL;
86 glShadeModel GL_FLAT; 93 glShadeModel GL_FLAT;
87 glDisable GL_DEPTH_TEST; 94 glDisable GL_DEPTH_TEST;
88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89 96
90 $_->() for @GL_INIT;
91
92 ############################################################################# 97 #############################################################################
98
99 $DEBUG_STATUS = new CFClient::UI::Label;
100 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
93 101
94 $STATUS_LINE = new Crossfire::Client::Widget::Label 102 $STATUS_LINE = new CFClient::UI::Label
95 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE, 103 y => $HEIGHT * 59 / 60 - $FONTSIZE;
96 "";
97 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE); 104 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
98 105
99 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 106 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
100 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60, 107 y => $HEIGHT * 59 / 60,
108 height => $HEIGHT / 60,
101 "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 109 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
102 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 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;
103 115
104 # Test code #d# 116 # Test code #d#
105 unless ($tw) { # haha... 117 unless ($tw) { # haha...
106 $te = new Crossfire::Client::Widget::FancyFrame; 118 my $w = new CFClient::UI::Window
107 $te->add (new Crossfire::Client::Widget::Entry); 119 w => 300, h => 300,
108 $te->move (300, 0, 2); 120 child => (my $frame = new CFClient::UI::FancyFrame);
109 $Crossfire::Client::Widget::TOPLEVEL->add ($te); 121 $CFClient::UI::TOPLEVEL->add ($w);
122
123 $frame->add (my $vbox = new CFClient::UI::VBox);
124
125 $vbox->add (new CFClient::UI::Entry text => "hallo");
126 $vbox->add (new CFClient::UI::Slider);
110 127
111 $tw = new Crossfire::Client::Widget::Animator; 128 $tw = new CFClient::UI::Animator x => $WIDTH - 200, w => 600, h => 300;
112 my $lbl1 = new Crossfire::Client::Widget::Label 129 my $lbl1 = new CFClient::UI::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
113 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!"; 130 my $lbl2 = new CFClient::UI::Label text => "LBL2";
114 my $lbl2 = new Crossfire::Client::Widget::Label
115 0, 0, 10, $FONTSIZE, "LBL2";
116
117 my $vb = new Crossfire::Client::Widget::VBox; 131 my $vb = new CFClient::UI::VBox;
118 my $f = new Crossfire::Client::Widget::FancyFrame; 132 my $f = new CFClient::UI::FancyFrame;
119 my $f2 = new Crossfire::Client::Widget::FancyFrame; 133 my $f2 = new CFClient::UI::FancyFrame;
120 $f->add ($lbl1); 134 $f->add ($lbl1);
121 $f2->add ($lbl2); 135 $f2->add ($lbl2);
122 $vb->add ($f); 136 $vb->add ($f);
123 $vb->add ($f2, 1); 137 $vb->add ($f2, 1);
124 138
125 $tw->add ($vb); 139 $tw->add ($vb);
126 $tw->w (400);
127 $tw->h (300);
128 $tw->move ($WIDTH - 200, 0);
129 $tw->moveto (0, 0); 140 $tw->moveto (0, 0);
130 $Crossfire::Client::Widget::TOPLEVEL->add ($tw); 141 $CFClient::UI::TOPLEVEL->add ($tw);
131 142
132# $f->move ($WIDTH - 200, 0); 143# $f->move ($WIDTH - 200, 0);
133# $Crossfire::Client::Widget::TOPLEVEL->add ($f); 144# $CFClient::UI::TOPLEVEL->add ($f);
134 } 145 }
135} 146}
136 147
148sub destroy_screen {
149 remove Glib::Source $SDL_TIMER;
150 undef $SDL_APP;
151 undef $SDL_EV;
152 SDL::Quit;
153}
154
155sub config_dialog {
156 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
157 child => (my $vbox = new CFClient::UI::VBox);
158 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
159
160 $CFClient::UI::TOPLEVEL->add ($dialog);
161}
162
137sub start_game { 163sub start_game {
138 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
139 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
140 while $SDL_EV->poll;
141
142 1
143 };
144
145 $WIDTH = $CFG->{width}; 164 $WIDTH = $CFG->{width};
146 $HEIGHT = $CFG->{height}; 165 $HEIGHT = $CFG->{height};
147 $FULLSCREEN = 0; 166 $FULLSCREEN = 0;
148 167
149 init_screen; 168 init_screen;
169
170 config_dialog;
150 171
151 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 172 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
152 173
153 $CONN = new conn 174 $CONN = new conn
154 host => $CFG->{host}, 175 host => $CFG->{host},
… …
157 pass => $CFG->{password}, 178 pass => $CFG->{password},
158 mapw => $mapsize, 179 mapw => $mapsize,
159 maph => $mapsize, 180 maph => $mapsize,
160 ; 181 ;
161 182
162 Crossfire::Client::lowdelay fileno $CONN->{fh}; 183 CFClient::lowdelay fileno $CONN->{fh};
163} 184}
164 185
165sub stop_game { 186sub stop_game {
166 remove Glib::Source $SDL_TIMER;
167 remove Glib::Source $refresh_handler if $refresh_handler; 187 remove Glib::Source $refresh_handler if $refresh_handler;
168 undef $refresh_handler; 188 undef $refresh_handler;
169 189
170 undef $SDL_APP;
171 undef $CONN; 190 undef $CONN;
172 SDL::Quit; 191 destroy_screen;
173} 192}
174 193
175sub force_refresh { 194sub force_refresh {
176 glViewport 0, 0, $WIDTH, $HEIGHT; 195 glViewport 0, 0, $WIDTH, $HEIGHT;
177 196
… …
180 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 199 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
181 glMatrixMode GL_MODELVIEW; 200 glMatrixMode GL_MODELVIEW;
182 201
183 glClear GL_COLOR_BUFFER_BIT; 202 glClear GL_COLOR_BUFFER_BIT;
184 203
185 $Crossfire::Client::Widget::TOPLEVEL->draw; 204 $CFClient::UI::TOPLEVEL->draw;
186 205
187 SDL::GLSwapBuffers; 206 SDL::GLSwapBuffers;
188} 207}
208
209sub debug {
210 $DEBUG_STATUS->set_text ($_[0]);
211 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
212 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
213}
214
215my $FPS;
189 216
190sub refresh { 217sub refresh {
191 $refresh_handler ||= add Glib::Idle sub { 218 $refresh_handler ||= add Glib::Idle sub {
192 if ($SDL_APP) { 219 if ($SDL_APP) {
193 my $next_refresh = SDL::GetTicks; 220 $NOW = SDL::GetTicks;
221
222 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
223 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
224 $NOW = SDL::GetTicks;
225 }
226
194 my $interval = ($next_refresh - $last_refresh) * 0.001; 227 my $interval = ($NOW - $last_refresh) * 0.001;
195 $last_refresh = $next_refresh; 228 $last_refresh = $NOW;
229
230 if ($interval) {
231 $FPS ||= 1 / $interval;
232 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
233 debug sprintf "%5.02f", $FPS;
234 }
196 235
197 force_refresh; 236 force_refresh;
198 $_->animate ($interval) for grep $_, values %ANIMATE; 237 $_->animate ($interval) for grep $_, values %ANIMATE;
199 238
200 if (%ANIMATE) { 239 if (%ANIMATE) {
… …
236 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 275 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
237 # alt-enter 276 # alt-enter
238 $FULLSCREEN = !$FULLSCREEN; 277 $FULLSCREEN = !$FULLSCREEN;
239 init_screen; 278 init_screen;
240 } else { 279 } else {
241 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 280 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
242 } 281 }
243 }, 282 },
244 SDL_KEYUP() => sub { 283 SDL_KEYUP() => sub {
245 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 284 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
246 }, 285 },
247 SDL_MOUSEMOTION() => sub { 286 SDL_MOUSEMOTION() => sub {
248 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV); 287 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
249 }, 288 },
250 SDL_MOUSEBUTTONDOWN() => sub { 289 SDL_MOUSEBUTTONDOWN() => sub {
251 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 290 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
252 }, 291 },
253 SDL_MOUSEBUTTONUP() => sub { 292 SDL_MOUSEBUTTONUP() => sub {
254 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 293 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
255 }, 294 },
256 SDL_ACTIVEEVENT() => sub { 295 SDL_ACTIVEEVENT() => sub {
257 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 296# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
258 }, 297 },
259); 298);
260 299
261@conn::ISA = Crossfire::Protocol::; 300@conn::ISA = Crossfire::Protocol::;
262 301
263sub conn::map_update { 302sub conn::map_update {
264 my ($self, $dirty) = @_; 303 my ($self, $dirty) = @_;
265 304
266 refresh; 305 $MAPWIDGET->update;
267} 306}
268 307
269sub conn::map_scroll { 308sub conn::map_scroll {
270 my ($self, $dx, $dy) = @_; 309 my ($self, $dx, $dy) = @_;
271 310
… …
287sub conn::face_update { 326sub conn::face_update {
288 my ($self, $face) = @_; 327 my ($self, $face) = @_;
289 328
290 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 329 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
291 330
292 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 331 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
293} 332}
294 333
295sub conn::query { 334sub conn::query {
296 my ($self, $flags, $prompt) = @_; 335 my ($self, $flags, $prompt) = @_;
297 336
… …
370 $cb->signal_connect (clicked => sub { 409 $cb->signal_connect (clicked => sub {
371 for (keys %$cfg) { 410 for (keys %$cfg) {
372 $::CFG->{$_} = $cfg->{$_} 411 $::CFG->{$_} = $cfg->{$_}
373 if $_ ne '_i'; 412 if $_ ne '_i';
374 } 413 }
375 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 414 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
376 }); 415 });
377 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 416 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
378 $cb->signal_connect (clicked => sub { 417 $cb->signal_connect (clicked => sub {
379 for (keys %$cfg) { 418 for (keys %$cfg) {
380 $::CFG->{$_} = $cfg->{$_} 419 $::CFG->{$_} = $cfg->{$_}
… …
399 438
400############################################################################# 439#############################################################################
401 440
402SDL::Init SDL_INIT_EVERYTHING; 441SDL::Init SDL_INIT_EVERYTHING;
403 442
404my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
405
406$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
407$mapwidget->focus_in;
408
409Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 443CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410 444
411$CFG ||= { 445$CFG ||= {
412 width => 640, 446 width => 640,
413 height => 480, 447 height => 480,
414 mapsize => 100, 448 mapsize => 100,
415 fullscreen => 0, 449 fullscreen => 0,
416 host => "crossfire.schmorp.de", 450 host => "crossfire.schmorp.de",
417 port => 13327, 451 port => 13327,
418}; 452};
419 453
420Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf"; 454{
455 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
456
457 CFClient::add_font $_ for @fonts;
458 CFClient::set_font $fonts[0];
459}
421 460
422$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 461$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
423 462
424run_config_dialog 463run_config_dialog
425 login => sub { start_game }, 464 login => sub { start_game },

Diff Legend

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