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.68 by root, Tue Apr 11 13:38:22 2006 UTC vs.
Revision 1.83 by root, Wed Apr 12 15:35:55 2006 UTC

… …
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol; 17use Crossfire::Protocol;
18 18
19use CFClient; 19use CFClient;
20use CFClient::Widget; 20use CFClient::UI;
21 21
22our $VERSION = '0.1'; 22our $VERSION = '0.1';
23 23
24my $MAX_FPS = 30; 24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26 26
27our $FACECACHE; 27our $FACECACHE;
28 28
29our $CFG; 29our $CFG;
30our $CONN; 30our $CONN;
31our $FAST; # fast, low-quality mode
31 32
33our @SDL_MODES;
32our $WIDTH; 34our $WIDTH;
33our $HEIGHT; 35our $HEIGHT;
34our $FULLSCREEN; 36our $FULLSCREEN;
35 37
38our $NOW;
39
40our $MAPWIDGET;
36our $FONTSIZE; 41our $FONTSIZE;
37 42
38our $SDL_TIMER; 43our $SDL_TIMER;
39our $SDL_APP; 44our $SDL_APP;
40our $SDL_EV; 45our $SDL_EV;
… …
46 51
47my $last_refresh; 52my $last_refresh;
48my %ANIMATE; 53my %ANIMATE;
49my $refresh_handler; 54my $refresh_handler;
50 55
51our ($tw, $te); # Test widget #d# 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 destroy_screen ();
90 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
91 $FULLSCREEN = $CFG->{fullscreen};
92 init_screen ();
93 });
94
95 $vbox->add (new CFClient::UI::Label align => 0, text => "Server");
96 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
98 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
99
100 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
101 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
102
103 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
104 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
105
106 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
107 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
108
109 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
110 $table->add (1, 6, new CFClient::UI::Slider
111 req_w => 100,
112 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
113 connect_changed => sub {
114 my ($self, $value) = @_;
115
116 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
117 },
118 );
119
120 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
121 warn "login\n";
122 });
123
124 $vbox->add (my $hbox = new CFClient::UI::HBox);
125
126 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
127 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
128 status "Configuration Saved";
129 });
130 $CFClient::UI::TOPLEVEL->add ($dialog);
131}
52 132
53sub init_screen { 133sub init_screen {
54 $SDL_APP = new SDL::App 134 $SDL_APP = new SDL::App
55 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 135 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
56 -title => "Crossfire+ Client", 136 -title => "Crossfire+ Client",
… …
66 -resizeable => 0; 146 -resizeable => 0;
67 147
68 $SDL_EV = new SDL::Event; 148 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1); 149 $SDL_EV->set_unicode (1);
70 150
71 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 151 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
72 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 152 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
73 while $SDL_EV->poll; 153 while $SDL_EV->poll;
74 154
75 1 155 1
76 }; 156 };
77 157
78 $last_refresh = SDL::GetTicks; 158 $last_refresh = SDL::GetTicks;
79 159
80 CFClient::gl_init; 160 CFClient::gl_init;
81 161
82 $FONTSIZE = int $HEIGHT / 50; 162 $FONTSIZE = int $HEIGHT / 40;
83 163
84 ############################################################################# 164 #############################################################################
85 165
86 glClearColor 0.45, 0.45, 0.45, 1;
87
88 glEnable GL_TEXTURE_2D;
89 glEnable GL_COLOR_MATERIAL;
90 glShadeModel GL_FLAT;
91 glDisable GL_DEPTH_TEST;
92 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
93
94 #############################################################################
95
96 $DEBUG_STATUS = new CFClient::Widget::Label; 166 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
97 $CFClient::Widget::TOPLEVEL->add ($DEBUG_STATUS); 167 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
98 168
99 $STATUS_LINE = new CFClient::Widget::Label 169 $STATUS_LINE = new CFClient::UI::Label
170 padding => 0,
100 y => $HEIGHT * 59 / 60 - $FONTSIZE; 171 y => $HEIGHT * 49 / 50 - $FONTSIZE;
101 $CFClient::Widget::TOPLEVEL->add ($STATUS_LINE); 172 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
102 173
103 $ALT_ENTER_MESSAGE = new CFClient::Widget::Label 174 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
175 padding => 0,
104 y => $HEIGHT * 59 / 60, 176 y => $HEIGHT * 49 / 50,
105 height => $HEIGHT / 60, 177 height => $HEIGHT / 50,
106 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 178 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
107 $CFClient::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 179 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
108 180
109 # Test code #d# 181 $MAPWIDGET = new CFClient::UI::MapWidget;
110 unless ($tw) { # haha...
111 $te = new CFClient::Widget::FancyFrame x => 300, z => 1;
112 $te->add (new CFClient::Widget::Entry);
113 $CFClient::Widget::TOPLEVEL->add ($te);
114
115 $tw = new CFClient::Widget::Animator x => $WIDTH - 200, w => 400, h => 300;
116 my $lbl1 = new CFClient::Widget::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
117 my $lbl2 = new CFClient::Widget::Label text => "LBL2";
118 my $vb = new CFClient::Widget::VBox;
119 my $f = new CFClient::Widget::FancyFrame;
120 my $f2 = new CFClient::Widget::FancyFrame;
121 $f->add ($lbl1);
122 $f2->add ($lbl2);
123 $vb->add ($f);
124 $vb->add ($f2, 1);
125
126 $tw->add ($vb);
127 $tw->moveto (0, 0);
128 $CFClient::Widget::TOPLEVEL->add ($tw);
129
130# $f->move ($WIDTH - 200, 0);
131# $CFClient::Widget::TOPLEVEL->add ($f); 182 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
132 } 183 $MAPWIDGET->focus_in;
184
185 config_dialog;
133} 186}
134 187
135sub destroy_screen { 188sub destroy_screen {
189 $CFClient::UI::TOPLEVEL->{children} = [];
136 remove Glib::Source $SDL_TIMER; 190 remove Glib::Source $SDL_TIMER;
137 undef $SDL_APP; 191 undef $SDL_APP;
138 undef $SDL_EV; 192 undef $SDL_EV;
139 SDL::Quit; 193 SDL::Quit;
140} 194}
… …
173 227
174 glMatrixMode GL_PROJECTION; 228 glMatrixMode GL_PROJECTION;
175 glLoadIdentity; 229 glLoadIdentity;
176 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 230 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
177 glMatrixMode GL_MODELVIEW; 231 glMatrixMode GL_MODELVIEW;
232 glLoadIdentity;
178 233
179 glClear GL_COLOR_BUFFER_BIT; 234 glClear GL_COLOR_BUFFER_BIT;
180 235
181 $CFClient::Widget::TOPLEVEL->draw; 236 $CFClient::UI::TOPLEVEL->draw;
182 237
183 SDL::GLSwapBuffers; 238 SDL::GLSwapBuffers;
184}
185
186sub debug {
187 $DEBUG_STATUS->set_text ($_[0]);
188 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
189 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
190} 239}
191 240
192my $FPS; 241my $FPS;
193 242
194sub refresh { 243sub refresh {
195 $refresh_handler ||= add Glib::Idle sub { 244 $refresh_handler ||= add Glib::Idle sub {
196 if ($SDL_APP) { 245 if ($SDL_APP) {
197 my $next_refresh = SDL::GetTicks; 246 $NOW = SDL::GetTicks;
198 247
199 if ($next_refresh - $last_refresh < $TICKS_PER_FRAME) { 248 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
200 SDL::Delay $TICKS_PER_FRAME - ($next_refresh - $last_refresh); 249 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
201 $next_refresh = SDL::GetTicks; 250 $NOW = SDL::GetTicks;
202 } 251 }
203 252
204 my $interval = ($next_refresh - $last_refresh) * 0.001; 253 my $interval = ($NOW - $last_refresh) * 0.001;
205 $last_refresh = $next_refresh; 254 $last_refresh = $NOW;
206 255
207 if ($interval) { 256 if ($interval) {
208 $FPS ||= 1 / $interval; 257 $FPS ||= 1 / $interval;
209 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04; 258 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
210 debug sprintf "%5.02f", $FPS; 259 debug sprintf "%5.02f", $FPS;
211 } 260 }
212 261
213 force_refresh; 262 force_refresh;
214 $_->animate ($interval) for grep $_, values %ANIMATE; 263 $_->animate ($interval) for grep $_, values %ANIMATE;
… …
250 }, 299 },
251 SDL_KEYDOWN() => sub { 300 SDL_KEYDOWN() => sub {
252 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 301 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
253 # alt-enter 302 # alt-enter
254 $FULLSCREEN = !$FULLSCREEN; 303 $FULLSCREEN = !$FULLSCREEN;
304 destroy_screen;
255 init_screen; 305 init_screen;
256 } else { 306 } else {
257 CFClient::Widget::feed_sdl_key_down_event ($SDL_EV); 307 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
258 } 308 }
259 }, 309 },
260 SDL_KEYUP() => sub { 310 SDL_KEYUP() => sub {
261 CFClient::Widget::feed_sdl_key_up_event ($SDL_EV); 311 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
262 }, 312 },
263 SDL_MOUSEMOTION() => sub { 313 SDL_MOUSEMOTION() => sub {
264 CFClient::Widget::feed_sdl_motion_event ($SDL_EV); 314 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
265 }, 315 },
266 SDL_MOUSEBUTTONDOWN() => sub { 316 SDL_MOUSEBUTTONDOWN() => sub {
267 CFClient::Widget::feed_sdl_button_down_event ($SDL_EV); 317 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
268 }, 318 },
269 SDL_MOUSEBUTTONUP() => sub { 319 SDL_MOUSEBUTTONUP() => sub {
270 CFClient::Widget::feed_sdl_button_up_event ($SDL_EV); 320 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
271 }, 321 },
272 SDL_ACTIVEEVENT() => sub { 322 SDL_ACTIVEEVENT() => sub {
273 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 323# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
274 }, 324 },
275); 325);
276 326
277@conn::ISA = Crossfire::Protocol::; 327@conn::ISA = Crossfire::Protocol::;
278 328
279sub conn::map_update { 329sub conn::map_update {
280 my ($self, $dirty) = @_; 330 my ($self, $dirty) = @_;
281 331
282 refresh; 332 $MAPWIDGET->update;
283} 333}
284 334
285sub conn::map_scroll { 335sub conn::map_scroll {
286 my ($self, $dx, $dy) = @_; 336 my ($self, $dx, $dy) = @_;
287 337
… …
349 [qw/Password password/], 399 [qw/Password password/],
350 ); 400 );
351 401
352 my $cfg = {}; 402 my $cfg = {};
353 403
354 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
355 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
356
357 $w->add (my $vb = Gtk2::VBox->new); 404 $w->add (my $vb = Gtk2::VBox->new);
358 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 405 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
359 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 406 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
360 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 407 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
361 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 408 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
362 my $i = 0; 409 my $i = 0;
363 my $act = 0; 410 my $act = 0;
364 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 411 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
365 if ($_ eq $selmode) { $act = $i } 412 if ($_ eq $selmode) { $act = $i }
366 $cb->append_text ($_); 413 $cb->append_text ($_);
367 $i++; 414 $i++;
368 } 415 }
369 $cb->set_active ($act); 416 $cb->set_active ($act);
… …
415 462
416############################################################################# 463#############################################################################
417 464
418SDL::Init SDL_INIT_EVERYTHING; 465SDL::Init SDL_INIT_EVERYTHING;
419 466
420my $mapwidget = CFClient::Widget::MapWidget->new; 467@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
421 468 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
422$CFClient::Widget::TOPLEVEL->add ($mapwidget);
423$mapwidget->focus_in;
424 469
425CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 470CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
426 471
427$CFG ||= { 472$CFG ||= {
428 width => 640, 473 width => 640,
429 height => 480, 474 height => 480,
475 fullscreen => 0,
476 sdl_mode => 0,
430 mapsize => 100, 477 mapsize => 100,
431 fullscreen => 0,
432 host => "crossfire.schmorp.de", 478 host => "crossfire.schmorp.de",
433 port => 13327, 479 port => 13327,
434}; 480};
435 481
436{ 482{
… …
447 logout => sub { stop_game }; 493 logout => sub { stop_game };
448 494
449main Gtk2; 495main Gtk2;
450 496
451Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces"; 497Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
498

Diff Legend

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