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

Diff Legend

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