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

Diff Legend

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