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.56 by root, Sun Apr 9 22:28:05 2006 UTC vs.
Revision 1.82 by root, Wed Apr 12 12:16:59 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;
31our $FAST; # fast, low-quality mode
30 32
33our @SDL_MODES;
31our $WIDTH; 34our $WIDTH;
32our $HEIGHT; 35our $HEIGHT;
33our $FULLSCREEN; 36our $FULLSCREEN;
34 37
38our $NOW;
39
40our $MAPWIDGET;
35our $FONTSIZE; 41our $FONTSIZE;
36our $FOCUS;
37our $HOVER;
38 42
39our $SDL_TIMER; 43our $SDL_TIMER;
40our $SDL_APP; 44our $SDL_APP;
41our $SDL_EV = new SDL::Event; 45our $SDL_EV;
42our %SDL_CB; 46our %SDL_CB;
43
44our @GL_INIT; # hooks called on every gl init
45 47
46our $ALT_ENTER_MESSAGE; 48our $ALT_ENTER_MESSAGE;
47our $STATUS_LINE; 49our $STATUS_LINE;
48 50our $DEBUG_STATUS;
49our $TOPLEVEL;
50
51our $tw; # Test widget #d#
52 51
53my $last_refresh; 52my $last_refresh;
54my %ANIMATE; 53my %ANIMATE;
55my $refresh_handler; 54my $refresh_handler;
55
56sub status {
57 $STATUS_LINE->set_text ($_[0]);
58 my ($w, $h) = $STATUS_LINE->size_request;
59 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
60}
61
62sub debug {
63 $DEBUG_STATUS->set_text ($_[0]);
64 my ($w, $h) = $DEBUG_STATUS->size_request;
65 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
66}
67
68sub config_dialog {
69 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
70 child => (my $vbox = new CFClient::UI::VBox);
71 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
72 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
73
74 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
75 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
76
77 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
78 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
79
80 $mode_slider->connect (changed => sub {
81 my ($self, $value) = @_;
82
83 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
84 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
85 });
86 $mode_slider->emit (changed => $mode_slider->{range}[0]);
87
88 $table->add (1, 1, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
89 warn "apply\n";
90 });
91
92 $vbox->add (new CFClient::UI::Label align => 0, text => "Server");
93 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
94 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
95 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
96
97 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
98 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
99
100 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
101 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
102
103 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
104 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
105
106 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
107 $table->add (1, 6, new CFClient::UI::Slider
108 req_w => 100,
109 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
110 connect_changed => sub {
111 my ($self, $value) = @_;
112
113 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
114 },
115 );
116
117 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
118 warn "login\n";
119 });
120
121 $vbox->add (my $hbox = new CFClient::UI::HBox);
122
123 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
124 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
125 status "Configuration Saved";
126 });
127 $CFClient::UI::TOPLEVEL->add ($dialog);
128}
56 129
57sub init_screen { 130sub init_screen {
58 $SDL_APP = new SDL::App 131 $SDL_APP = new SDL::App
59 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 132 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
60 -title => "Crossfire+ Client", 133 -title => "Crossfire+ Client",
67 -alpha_size => 0, 140 -alpha_size => 0,
68 -double_buffer => 1, 141 -double_buffer => 1,
69 -fullscreen => $FULLSCREEN, 142 -fullscreen => $FULLSCREEN,
70 -resizeable => 0; 143 -resizeable => 0;
71 144
72 $last_refresh = SDL::GetTicks; 145 $SDL_EV = new SDL::Event;
146 $SDL_EV->set_unicode (1);
73 147
74 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
75
76 $GL_EXT{GL_ARB_texture_non_power_of_two}
77 or warn "WARNING: non-power-of-two opengl extension required";
78
79 $FONTSIZE = int $HEIGHT / 50;
80
81 #############################################################################
82
83 glClearColor 0, 0, 0, 0;
84
85 glEnable GL_TEXTURE_2D;
86 glEnable GL_COLOR_MATERIAL;
87 glShadeModel GL_FLAT;
88 glDisable GL_DEPTH_TEST;
89 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
90
91 $_->() for @GL_INIT;
92
93 #############################################################################
94
95 $STATUS_LINE = new Crossfire::Client::Widget::Label
96 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
97 "";
98 $TOPLEVEL->add ($STATUS_LINE);
99
100 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
101 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
102 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
103 $TOPLEVEL->add ($ALT_ENTER_MESSAGE);
104
105 # Test code #d#
106 unless ($tw) { # haha...
107 $tw = new Crossfire::Client::Widget::Animator;
108 my $lbl1 = new Crossfire::Client::Widget::Label
109 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
110 my $lbl2 = new Crossfire::Client::Widget::Label
111 0, 0, 10, $FONTSIZE, "LBL2";
112
113 my $vb = new Crossfire::Client::Widget::VBox;
114 my $f = new Crossfire::Client::Widget::FancyFrame;
115 my $f2 = new Crossfire::Client::Widget::FancyFrame;
116 $f->add ($lbl1);
117 $f2->add ($lbl2);
118 $vb->add ($f);
119 $vb->add ($f2, 1);
120
121 $tw->add ($vb);
122 $tw->w (400);
123 $tw->h (300);
124 $tw->move ($WIDTH - 200, 0);
125 $tw->moveto (0, 0);
126 $TOPLEVEL->add ($tw);
127
128# $f->move ($WIDTH - 200, 0);
129# $TOPLEVEL->add ($f);
130 }
131}
132
133sub start_game {
134 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 148 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
135 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 149 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
136 while $SDL_EV->poll; 150 while $SDL_EV->poll;
137 151
138 1 152 1
139 }; 153 };
140 154
155 $last_refresh = SDL::GetTicks;
156
157 CFClient::gl_init;
158
159 $FONTSIZE = int $HEIGHT / 40;
160
161 #############################################################################
162
163 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
164 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
165
166 $STATUS_LINE = new CFClient::UI::Label
167 padding => 0,
168 y => $HEIGHT * 49 / 50 - $FONTSIZE;
169 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
170
171 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
172 padding => 0,
173 y => $HEIGHT * 49 / 50,
174 height => $HEIGHT / 50,
175 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
176 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
177
178 $MAPWIDGET = new CFClient::UI::MapWidget;
179 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
180 $MAPWIDGET->focus_in;
181
182 config_dialog;
183}
184
185sub destroy_screen {
186 $CFClient::UI::TOPLEVEL->{children} = [];
187 remove Glib::Source $SDL_TIMER;
188 undef $SDL_APP;
189 undef $SDL_EV;
190 SDL::Quit;
191}
192
193sub start_game {
141 $WIDTH = $CFG->{width}; 194 $WIDTH = $CFG->{width};
142 $HEIGHT = $CFG->{height}; 195 $HEIGHT = $CFG->{height};
143 $FULLSCREEN = 0; 196 $FULLSCREEN = 0;
144 197
145 init_screen; 198 init_screen;
146 199
147 my $mapsize = List::Util::min 64, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32; 200 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
148 201
149 $CONN = new conn 202 $CONN = new conn
150 host => $CFG->{host}, 203 host => $CFG->{host},
151 port => $CFG->{port}, 204 port => $CFG->{port},
152 user => $CFG->{user}, 205 user => $CFG->{user},
153 pass => $CFG->{password}, 206 pass => $CFG->{password},
154 mapw => $mapsize, 207 mapw => $mapsize,
155 maph => $mapsize, 208 maph => $mapsize,
156 ; 209 ;
157 210
158 Crossfire::Client::lowdelay fileno $CONN->{fh}; 211 CFClient::lowdelay fileno $CONN->{fh};
159} 212}
160 213
161sub stop_game { 214sub stop_game {
162 remove Glib::Source $SDL_TIMER;
163 remove Glib::Source $refresh_handler if $refresh_handler; 215 remove Glib::Source $refresh_handler if $refresh_handler;
164 undef $refresh_handler; 216 undef $refresh_handler;
165 217
166 undef $SDL_APP;
167 undef $CONN; 218 undef $CONN;
168 SDL::Quit; 219 destroy_screen;
169} 220}
170
171 221
172sub force_refresh { 222sub force_refresh {
173 glViewport 0, 0, $WIDTH, $HEIGHT; 223 glViewport 0, 0, $WIDTH, $HEIGHT;
174 224
175 glMatrixMode GL_PROJECTION; 225 glMatrixMode GL_PROJECTION;
176 glLoadIdentity; 226 glLoadIdentity;
177 glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000; 227 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
178 glMatrixMode GL_MODELVIEW; 228 glMatrixMode GL_MODELVIEW;
229 glLoadIdentity;
179 230
180 glClear GL_COLOR_BUFFER_BIT; 231 glClear GL_COLOR_BUFFER_BIT;
181 232
182 $TOPLEVEL->draw; 233 $CFClient::UI::TOPLEVEL->draw;
183 234
184 SDL::GLSwapBuffers; 235 SDL::GLSwapBuffers;
185} 236}
237
238my $FPS;
186 239
187sub refresh { 240sub refresh {
188 $refresh_handler ||= add Glib::Idle sub { 241 $refresh_handler ||= add Glib::Idle sub {
189 return unless $SDL_APP; 242 if ($SDL_APP) {
243 $NOW = SDL::GetTicks;
190 244
191 my $next_refresh = SDL::GetTicks; 245 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
246 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
247 $NOW = SDL::GetTicks;
248 }
249
192 my $interval = ($next_refresh - $last_refresh) * 0.001; 250 my $interval = ($NOW - $last_refresh) * 0.001;
193 $last_refresh = $next_refresh; 251 $last_refresh = $NOW;
194 252
253 if ($interval) {
254 $FPS ||= 1 / $interval;
255 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
256 debug sprintf "%5.02f", $FPS;
257 }
258
195 force_refresh; 259 force_refresh;
196 $_->animate ($interval) for grep $_, values %ANIMATE; 260 $_->animate ($interval) for grep $_, values %ANIMATE;
197 261
198 if (%ANIMATE) { 262 if (%ANIMATE) {
263 1
264 } else {
265 undef $refresh_handler;
266 0
199 1 267 }
200 } else { 268 } else {
201 undef $refresh_handler; 269 undef $refresh_handler;
202 0 270 0
203 } 271 }
204 }; 272 };
228 }, 296 },
229 SDL_KEYDOWN() => sub { 297 SDL_KEYDOWN() => sub {
230 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 298 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
231 # alt-enter 299 # alt-enter
232 $FULLSCREEN = !$FULLSCREEN; 300 $FULLSCREEN = !$FULLSCREEN;
301 destroy_screen;
233 init_screen; 302 init_screen;
234 } else { 303 } else {
235 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 304 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
236 } 305 }
237 }, 306 },
238 SDL_KEYUP() => sub { 307 SDL_KEYUP() => sub {
239 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 308 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
240 }, 309 },
241 SDL_MOUSEMOTION() => sub { 310 SDL_MOUSEMOTION() => sub {
242 my ($x, $y) = ($SDL_EV->motion_x, $SDL_EV->motion_y); 311 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
243 $HOVER = $TOPLEVEL->find_widget ($x, $y);
244 ::refresh;
245
246 warn "mouse $x, $y = $HOVER\n";
247 }, 312 },
248 SDL_MOUSEBUTTONDOWN() => sub { 313 SDL_MOUSEBUTTONDOWN() => sub {
249 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 314 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
250 }, 315 },
251 SDL_MOUSEBUTTONUP() => sub { 316 SDL_MOUSEBUTTONUP() => sub {
252 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 317 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
253 }, 318 },
254 SDL_ACTIVEEVENT() => sub { 319 SDL_ACTIVEEVENT() => sub {
255 warn "active\n";#d# 320# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
256 }, 321 },
257); 322);
258 323
259@conn::ISA = Crossfire::Protocol::; 324@conn::ISA = Crossfire::Protocol::;
260 325
261sub conn::map_update { 326sub conn::map_update {
262 my ($self, $dirty) = @_; 327 my ($self, $dirty) = @_;
263 328
264 refresh; 329 $MAPWIDGET->update;
265} 330}
266 331
267sub conn::map_scroll { 332sub conn::map_scroll {
268 my ($self, $dx, $dy) = @_; 333 my ($self, $dx, $dy) = @_;
269 334
285sub conn::face_update { 350sub conn::face_update {
286 my ($self, $face) = @_; 351 my ($self, $face) = @_;
287 352
288 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 353 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
289 354
290 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 355 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
291} 356}
292 357
293sub conn::query { 358sub conn::query {
294 my ($self, $flags, $prompt) = @_; 359 my ($self, $flags, $prompt) = @_;
295 360
331 [qw/Password password/], 396 [qw/Password password/],
332 ); 397 );
333 398
334 my $cfg = {}; 399 my $cfg = {};
335 400
336 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
337 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
338
339 $w->add (my $vb = Gtk2::VBox->new); 401 $w->add (my $vb = Gtk2::VBox->new);
340 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 402 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
341 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 403 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
342 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 404 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
343 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 405 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
344 my $i = 0; 406 my $i = 0;
345 my $act = 0; 407 my $act = 0;
346 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 408 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
347 if ($_ eq $selmode) { $act = $i } 409 if ($_ eq $selmode) { $act = $i }
348 $cb->append_text ($_); 410 $cb->append_text ($_);
349 $i++; 411 $i++;
350 } 412 }
351 $cb->set_active ($act); 413 $cb->set_active ($act);
368 $cb->signal_connect (clicked => sub { 430 $cb->signal_connect (clicked => sub {
369 for (keys %$cfg) { 431 for (keys %$cfg) {
370 $::CFG->{$_} = $cfg->{$_} 432 $::CFG->{$_} = $cfg->{$_}
371 if $_ ne '_i'; 433 if $_ ne '_i';
372 } 434 }
373 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 435 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
374 }); 436 });
375 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 437 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
376 $cb->signal_connect (clicked => sub { 438 $cb->signal_connect (clicked => sub {
377 for (keys %$cfg) { 439 for (keys %$cfg) {
378 $::CFG->{$_} = $cfg->{$_} 440 $::CFG->{$_} = $cfg->{$_}
397 459
398############################################################################# 460#############################################################################
399 461
400SDL::Init SDL_INIT_EVERYTHING; 462SDL::Init SDL_INIT_EVERYTHING;
401 463
402$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new; 464@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
465 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
403 466
404my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
405
406$TOPLEVEL->add ($mapwidget);
407$mapwidget->focus_in;
408
409Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 467CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410 468
411$CFG ||= { 469$CFG ||= {
412 width => 640, 470 width => 640,
413 height => 480, 471 height => 480,
472 fullscreen => 0,
473 sdl_mode => 0,
414 mapsize => 100, 474 mapsize => 100,
415 fullscreen => 0,
416 host => "crossfire.schmorp.de", 475 host => "crossfire.schmorp.de",
417 port => 13327, 476 port => 13327,
418}; 477};
419 478
420Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf"; 479{
480 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
481
482 CFClient::add_font $_ for @fonts;
483 CFClient::set_font $fonts[0];
484}
421 485
422$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 486$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
423 487
424run_config_dialog 488run_config_dialog
425 login => sub { start_game }, 489 login => sub { start_game },
426 logout => sub { stop_game }; 490 logout => sub { stop_game };
427 491
428main Gtk2; 492main Gtk2;
429 493
430Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 494Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
495

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines