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.39 by root, Sun Apr 9 00:09:50 2006 UTC vs.
Revision 1.47 by elmex, Sun Apr 9 18:28:23 2006 UTC

… …
41 41
42our @GL_INIT; # hooks called on every gl init 42our @GL_INIT; # hooks called on every gl init
43 43
44our $ALT_ENTER_MESSAGE; 44our $ALT_ENTER_MESSAGE;
45 45
46our $TOPLEVEL;
47
46our $tw; # Test widget #d# 48our $tw; # Test widget #d#
49
50my $last_refresh;
47 51
48sub init_screen { 52sub init_screen {
49 $SDL_APP = new SDL::App 53 $SDL_APP = new SDL::App
50 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 54 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
51 -title => "Crossfire+ Client", 55 -title => "Crossfire+ Client",
… …
57 -blue_size => 8, 61 -blue_size => 8,
58 -double_buffer => 1, 62 -double_buffer => 1,
59 -fullscreen => $FULLSCREEN, 63 -fullscreen => $FULLSCREEN,
60 -resizeable => 0; 64 -resizeable => 0;
61 65
66 $last_refresh = SDL::GetTicks;
67
62 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 68 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
63 69
64 $GL_EXT{GL_ARB_texture_non_power_of_two} 70 $GL_EXT{GL_ARB_texture_non_power_of_two}
65 or warn "WARNING: non-power-of-two opengl extension required"; 71 or warn "WARNING: non-power-of-two opengl extension required";
66 72
67 $FONTSIZE = int $HEIGHT / 40; 73 $FONTSIZE = int $HEIGHT / 50;
68 74
69 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE, "Alt-Enter toggles fullscreen mode"; 75 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
76 0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE,
77 "Use <b>Alt-Enter</b> to toggle fullscreen mode";
70 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]); 78 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
71 $ALT_ENTER_MESSAGE->activate; 79 $TOPLEVEL->add ($ALT_ENTER_MESSAGE);
72 80
73 # Test code #d# 81 # Test code #d#
74 { 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;
75 my $frm = new Crossfire::Client::Widget::Frame; 90 my $f = new Crossfire::Client::Widget::FancyFrame;
76 $tw = new Crossfire::Client::Widget::Window; 91 my $f2 = new Crossfire::Client::Widget::FancyFrame;
77 $frm->add (new Crossfire::Client::Widget::Label 0, 0, 10, $FONTSIZE, "Foo in the garden!"); 92 $f->add ($lbl1);
93 $f2->add ($lbl2);
94 $vb->add ($f);
95 $vb->add ($f2, 1);
96
78 $tw->add ($frm); 97 $tw->add ($vb);
79 98 $tw->w (400);
99 $tw->h (300);
100 $tw->move ($WIDTH - 200, 0);
80 $tw->move (0, $HEIGHT - 120); 101 $tw->moveto (0, 0);
81 $tw->activate; 102 $TOPLEVEL->add ($tw);
103
104# $f->move ($WIDTH - 200, 0);
105# $TOPLEVEL->add ($f);
82 } 106 }
83 107
84 glClearColor 0, 0, 0, 0; 108 glClearColor 0, 0, 0, 0;
85 109
86 glEnable GL_TEXTURE_2D; 110 glEnable GL_TEXTURE_2D;
… …
112 user => $CFG->{user}, 136 user => $CFG->{user},
113 pass => $CFG->{password}, 137 pass => $CFG->{password},
114 mapw => 50, 138 mapw => 50,
115 maph => 37, 139 maph => 37,
116 ; 140 ;
141
142 Crossfire::Client::lowdelay fileno $CONN->{fh};
117} 143}
118 144
119sub stop_game { 145sub stop_game {
120 remove Glib::Source $SDL_TIMER; 146 remove Glib::Source $SDL_TIMER;
121 147
… …
127sub force_refresh { 153sub force_refresh {
128 glViewport 0, 0, $WIDTH, $HEIGHT; 154 glViewport 0, 0, $WIDTH, $HEIGHT;
129 155
130 glMatrixMode GL_PROJECTION; 156 glMatrixMode GL_PROJECTION;
131 glLoadIdentity; 157 glLoadIdentity;
132 glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100; 158 glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000;
133 glMatrixMode GL_MODELVIEW; 159 glMatrixMode GL_MODELVIEW;
134 160
135 glClear GL_COLOR_BUFFER_BIT; 161 glClear GL_COLOR_BUFFER_BIT;
136 162
137 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 163 $TOPLEVEL->draw;
138 164
139 SDL::GLSwapBuffers; 165 SDL::GLSwapBuffers;
140} 166}
167
168my %ANIMATE;
141 169
142my $refresh_handler; 170my $refresh_handler;
143 171
144sub refresh { 172sub refresh {
145 $refresh_handler ||= add Glib::Idle sub { 173 $refresh_handler ||= add Glib::Idle sub {
174 my $next_refresh = SDL::GetTicks;
175 my $interval = ($next_refresh - $last_refresh) * 0.001;
176 $last_refresh = $next_refresh;
177
146 force_refresh; 178 force_refresh;
179 $_->animate ($interval) for grep $_, values %ANIMATE;
180
181 if (%ANIMATE) {
182 1
183 } else {
147 undef $refresh_handler; 184 undef $refresh_handler;
185 0
148 0 186 }
149 }; 187 };
188}
189
190sub animation_start {
191 my ($widget) = @_;
192 $ANIMATE{$widget} = $widget;
193 Scalar::Util::weaken $ANIMATE{$widget};
194
195 refresh;
196}
197
198sub animation_stop {
199 my ($widget) = @_;
200 delete $ANIMATE{$widget};
150} 201}
151 202
152%SDL_CB = ( 203%SDL_CB = (
153 SDL_QUIT() => sub { 204 SDL_QUIT() => sub {
154 main_quit Gtk2; 205 main_quit Gtk2;
… …
193} 244}
194 245
195sub conn::map_scroll { 246sub conn::map_scroll {
196 my ($self, $dx, $dy) = @_; 247 my ($self, $dx, $dy) = @_;
197 248
198 refresh; 249# refresh;
199} 250}
200 251
201sub conn::map_clear { 252sub conn::map_clear {
202 my ($self) = @_; 253 my ($self) = @_;
203 254
204 refresh; 255# refresh;
205} 256}
206 257
207sub conn::face_find { 258sub conn::face_find {
208 my ($self, $face) = @_; 259 my ($self, $face) = @_;
209 260
… …
235 } 286 }
236 $ent->set_text ($value); 287 $ent->set_text ($value);
237 $ent->signal_connect (changed => sub { 288 $ent->signal_connect (changed => sub {
238 my ($ent) = @_; 289 my ($ent) = @_;
239 $cfg->{$key} = $ent->get_text; 290 $cfg->{$key} = $ent->get_text;
291 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
292 $cfg->{$key} = 100;
293 $ent->set_text ('100');
294 } elsif ($key eq 'mapsize' and $cfg->{$key} < 0) {
295 $cfg->{$key} = 0;
296 $ent->set_text ('0');
297 }
240 }); 298 });
241} 299}
242 300
243sub run_config_dialog { 301sub run_config_dialog {
244 my (%events) = @_; 302 my (%events) = @_;
… …
246 my $w = Gtk2::Window->new; 304 my $w = Gtk2::Window->new;
247 305
248 my @cfg = ( 306 my @cfg = (
249 [qw/Host host/], 307 [qw/Host host/],
250 [qw/Port port/], 308 [qw/Port port/],
309 [qw/Mapsize% mapsize/],
251 [qw/Username user/], 310 [qw/Username user/],
252 [qw/Password password/], 311 [qw/Password password/],
253 ); 312 );
254 313
255 my $cfg = {}; 314 my $cfg = {};
… …
318 377
319############################################################################# 378#############################################################################
320 379
321SDL::Init SDL_INIT_EVERYTHING; 380SDL::Init SDL_INIT_EVERYTHING;
322 381
382$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;
383
323my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 384my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
324 385
325$mapwidget->activate; 386$TOPLEVEL->add ($mapwidget);
326$mapwidget->focus_in; 387$mapwidget->focus_in;
327 388
328Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 389Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
329 390
330$CFG ||= { 391$CFG ||= {
331 width => 640, 392 width => 640,
332 height => 480, 393 height => 480,
394 mapsize => 100,
333 fullscreen => 0, 395 fullscreen => 0,
334 host => "crossfire.schmorp.de", 396 host => "crossfire.schmorp.de",
335 port => 13327, 397 port => 13327,
336}; 398};
337 399
400Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";
401
338$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 402$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
339 403
340run_config_dialog 404run_config_dialog
341 login => sub { start_game }, 405 login => sub { start_game },
342 logout => sub { stop_game }; 406 logout => sub { stop_game };

Diff Legend

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