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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines