ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.36 by elmex, Sun Apr 9 17:39:56 2006 UTC vs.
Revision 1.67 by root, Tue Apr 11 14:36:59 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
15sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
16sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
22} 84}
23 85
24sub move { 86sub move {
25 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 88 $self->{x} = $x;
… …
37 Carp::confess "size_request is abtract"; 99 Carp::confess "size_request is abtract";
38} 100}
39 101
40sub size_allocate { 102sub size_allocate {
41 my ($self, $w, $h) = @_; 103 my ($self, $w, $h) = @_;
104
42 $self->w ($w); 105 $self->{w} = $w;
43 $self->h ($h); 106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 114}
45 115
46sub focus_in { 116sub focus_in {
47 my ($widget) = @_; 117 my ($self) = @_;
48 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
49} 122}
50 123
51sub focus_out { 124sub focus_out {
52 my ($widget) = @_; 125 my ($self) = @_;
53}
54 126
55sub key_down { 127 return unless $FOCUS == $self;
56 my ($widget, $sdlev) = @_;
57}
58 128
59sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
60 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
61} 131}
62 132
133sub mouse_motion { }
134sub button_up { }
63sub button_down { 135sub button_down { }
64 my ($widget, $sdlev) = @_; 136sub key_down { }
65} 137sub key_up { }
66 138
67sub button_up {
68 my ($widget, $sdlev) = @_;
69}
70
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 144
77sub draw { 145sub draw {
78 my ($self) = @_; 146 my ($self) = @_;
79 147
80 glPushMatrix; 148 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
83 glPopMatrix; 162 glPopMatrix;
84} 163}
85 164
86sub _draw { 165sub _draw {
87 my ($widget) = @_; 166 my ($self) = @_;
167
168 warn "no draw defined for $self\n";
88} 169}
89 170
90sub bbox { 171sub bbox {
91 my ($self) = @_; 172 my ($self) = @_;
92 my ($w, $h) = $self->size_request; 173 my ($w, $h) = $self->size_request;
… …
96 $self->{x} = $w, 177 $self->{x} = $w,
97 $self->{y} = $h 178 $self->{y} = $h
98 ) 179 )
99} 180}
100 181
182sub find_widget {
183 my ($self, $x, $y) = @_;
184
185 return $self
186 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188
189 ()
190}
191
101sub del_parent { $_[0]->{parent} = undef } 192sub del_parent { $_[0]->{parent} = undef }
102 193
103sub set_parent { 194sub set_parent {
104 my ($self, $par) = @_; 195 my ($self, $par) = @_;
105 196
… …
122 my ($self) = @_; 213 my ($self) = @_;
123 214
124 #$self->deactivate; 215 #$self->deactivate;
125} 216}
126 217
127package Crossfire::Client::Widget::Bin; 218#############################################################################
128 219
220package CFClient::Widget::Empty;
221
129our @ISA = Crossfire::Client::Widget::; 222our @ISA = CFClient::Widget::;
130 223
131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] } 224sub size_request {
132sub get { $_[0]->{child} } 225 (0, 0)
226}
227
228sub draw { }
229
230#############################################################################
231
232package CFClient::Widget::Container;
233
234our @ISA = CFClient::Widget::;
235
236sub new {
237 my ($class, %arg) = @_;
238
239 my $children = delete $arg{children} || [];
240
241 my $self = $class->SUPER::new (children => [], %arg);
242 $self->add ($_) for @$children;
243
244 $self
245}
246
247sub add {
248 my ($self, $chld, $expand) = @_;
249
250 $chld->{expand} = $expand;
251 $chld->set_parent ($self);
252
253 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld
256 ];
257
258 $self->size_allocate ($self->{w}, $self->{h})
259 if $self->{w}; #TODO: check for "realised state"
260}
133 261
134sub remove { 262sub remove {
135 my ($self, $chld) = @_; 263 my ($self, $widget) = @_;
136 delete $self->{child} 264
137 if $self->{child} == $chld; 265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266
267 $self->size_allocate ($self->{w}, $self->{h});
138} 268}
269
270sub find_widget {
271 my ($self, $x, $y) = @_;
272
273 $x -= $self->{x};
274 $y -= $self->{y};
275
276 my $res;
277
278 for (reverse @{ $self->{children} }) {
279 $res = $_->find_widget ($x, $y)
280 and return $res;
281 }
282
283 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
284}
285
286sub _draw {
287 my ($self) = @_;
288
289 $_->draw for @{$self->{children}};
290}
291
292#############################################################################
293
294package CFClient::Widget::Bin;
295
296our @ISA = CFClient::Widget::Container::;
297
298sub new {
299 my ($class, %arg) = @_;
300
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
302
303 $class->SUPER::new (children => [$child], %arg)
304}
305
306sub add {
307 my ($self, $widget) = @_;
308
309 $self->{children} = [];
310
311 $self->SUPER::add ($widget);
312}
313
314sub remove {
315 my ($self, $widget) = @_;
316
317 $self->SUPER::remove ($widget);
318
319 $self->{children} = [new CFClient::Widget::Empty]
320 unless @{$self->{children}};
321}
322
323sub child { $_[0]->{children}[0] }
139 324
140sub size_request { 325sub size_request {
141 $_[0]->{child}->size_request if $_[0]->{child} 326 $_[0]{children}[0]->size_request if $_[0]{children}[0];
142} 327}
328
143sub size_allocate { 329sub size_allocate {
144 my ($self, $w, $h) = @_; 330 my ($self, $w, $h) = @_;
331
145 $self->SUPER::size_allocate ($w, $h); 332 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h) 333 $self->{children}[0]->size_allocate ($w, $h)
147 if $self->{child} 334 if $self->{children}[0]
148} 335}
149 336
150sub _draw { 337#############################################################################
151 my ($self) = @_;
152 338
153 $self->{child}->draw; 339package CFClient::Widget::Window;
154}
155 340
156package Crossfire::Client::Widget::Toplevel;
157
158our @ISA = Crossfire::Client::Widget::; 341our @ISA = CFClient::Widget::Bin::;
159 342
160use SDL::OpenGL; 343use SDL::OpenGL;
161 344
162sub add { 345sub new {
163 my ($self, $chld) = @_; 346 my ($class, %arg) = @_;
164 347
165 push @{$self->{childs}}, $chld; 348 my $self = $class->SUPER::new (%arg);
166 @{$self->{childs}} =
167 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}};
169
170 $chld->set_parent ($self);
171 $chld->size_allocate ($chld->size_request);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180} 349}
181 350
182sub update { 351sub update {
183 my ($self) = @_; 352 my ($self) = @_;
184 ::refresh ();
185}
186 353
187sub _draw { 354 # we want to do this delayed...
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 warn "ADD $chld\n";
202 $self->SUPER::add ($chld);
203 $chld->set_parent ($self);
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 # $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld; 355 $self->render_chld;
356 $self->SUPER::update;
215} 357}
216 358
217sub render_chld { 359sub render_chld {
218 my ($self) = @_; 360 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 361
222 require Carp;
223 Carp::cluck "RENDERCHI $w $h";
224 warn "RENDERCHI $w $h\n";
225 $self->{texture} = 362 $self->{texture} =
226 Crossfire::Client::Texture->new_from_opengl ( 363 CFClient::Texture->new_from_opengl (
227 $w, $h, sub { $chld->draw } 364 $self->{w}, $self->{h}, sub { $self->child->draw }
228 ); 365 );
229 $self->{texture}->upload;
230}
231
232sub size_request {
233 my ($self) = @_;
234 ($self->w, $self->h)
235} 366}
236 367
237sub size_allocate { 368sub size_allocate {
238 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
239 370
240 $self->w ($w); 371 $self->{w} = $w;
241 $self->h ($h); 372 $self->{h} = $h;
373
242 $self->get->size_allocate ($w, $h); 374 $self->child->size_allocate ($w, $h);
243 375
244 $self->update; #TODO: Move this to the size_request event propably? 376 $self->render_chld;
245} 377}
246 378
247sub _draw { 379sub _draw {
248 my ($self) = @_; 380 my ($self) = @_;
249 381
… …
253 or return; 385 or return;
254 386
255 glEnable GL_BLEND; 387 glEnable GL_BLEND;
256 glEnable GL_TEXTURE_2D; 388 glEnable GL_TEXTURE_2D;
257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
258 glBindTexture GL_TEXTURE_2D, $tex->{name};
259 390
260 glBegin GL_QUADS; 391 $tex->draw_quad (0, 0, $w, $h);
261 glTexCoord 0, 0; glVertex 0, 0;
262 glTexCoord 0, 1; glVertex 0, $h;
263 glTexCoord 1, 1; glVertex $w, $h;
264 glTexCoord 1, 0; glVertex $w, 0;
265 glEnd;
266 392
267 glDisable GL_BLEND; 393 glDisable GL_BLEND;
268 glDisable GL_TEXTURE_2D; 394 glDisable GL_TEXTURE_2D;
269} 395}
270 396
397#############################################################################
398
271package Crossfire::Client::Widget::Frame; 399package CFClient::Widget::Frame;
272 400
273our @ISA = Crossfire::Client::Widget::Bin::; 401our @ISA = CFClient::Widget::Bin::;
274 402
275use SDL::OpenGL; 403use SDL::OpenGL;
276 404
277sub size_request { 405sub size_request {
278 my ($self) = @_; 406 my ($self) = @_;
279 my $chld = $self->get 407 my $chld = $self->child
280 or return (0, 0); 408 or return (0, 0);
281 409
282 $chld->move (2, 2); 410 $chld->move (2, 2);
283 411
284 map { $_ + 4 } $chld->size_request; 412 map { $_ + 4 } $chld->size_request;
285} 413}
286 414
287sub size_allocate { 415sub size_allocate {
288 my ($self, $w, $h) = @_; 416 my ($self, $w, $h) = @_;
289 417
290 $self->w ($w); 418 $self->{w} = $w;
291 $self->h ($h); 419 $self->{h} = $h;
292 420
293 $self->get->size_allocate ($w - 4, $h - 4); 421 $self->child->size_allocate ($w - 4, $h - 4);
294 $self->get->move (2, 2); 422 $self->child->move (2, 2);
295} 423}
296 424
297sub _draw { 425sub _draw {
298 my ($self) = @_; 426 my ($self) = @_;
299 427
300 my $chld = $self->get; 428 my $chld = $self->child;
301 429
302 my ($w, $h) = $chld->size_request; 430 my ($w, $h) = $chld->size_request;
303 431
304 glBegin GL_QUADS; 432 glBegin GL_QUADS;
305 glColor 0, 0, 0; 433 glColor 0, 0, 0;
306 glTexCoord 0, 0; glVertex 0 , 0; 434 glVertex 0 , 0;
307 glTexCoord 0, 1; glVertex 0 , $h + 4; 435 glVertex 0 , $h + 4;
308 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 436 glVertex $w + 4 , $h + 4;
309 glTexCoord 1, 0; glVertex $w + 4 , 0; 437 glVertex $w + 4 , 0;
310 glEnd; 438 glEnd;
311 439
312 $chld->draw; 440 $chld->draw;
313} 441}
314 442
443#############################################################################
444
315package Crossfire::Client::Widget::FancyFrame; 445package CFClient::Widget::FancyFrame;
316 446
317our @ISA = Crossfire::Client::Widget::Frame::; 447our @ISA = CFClient::Widget::Bin::;
318 448
319use SDL::OpenGL; 449use SDL::OpenGL;
320 450
321sub new { 451my @tex =
322 my ($self, $theme) = @_;
323 $self = $self->SUPER::new;
324
325 $self->{txts} = [
326 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
328 ];
329 $self
330}
331 454
332sub size_request { 455sub size_request {
333 my ($self) = @_; 456 my ($self) = @_;
457
334 my ($w, $h) = $self->get->size_request; 458 my ($w, $h) = $self->SUPER::size_request;
335 459
336 $h += $self->{txts}->[1]->{height}; 460 $h += $tex[1]->{height};
337 $h += $self->{txts}->[4]->{height}; 461 $h += $tex[4]->{height};
338 $w += $self->{txts}->[2]->{width}; 462 $w += $tex[2]->{width};
339 $w += $self->{txts}->[3]->{width}; 463 $w += $tex[3]->{width};
340 464
341 ($w, $h) 465 ($w, $h)
342} 466}
343 467
344sub size_allocate { 468sub size_allocate {
345 my ($self, $w, $h) = @_; 469 my ($self, $w, $h) = @_;
346 470
347 $self->w ($w); 471 $self->SUPER::size_allocate ($w, $h);
348 $self->h ($h); 472
349 $h -= $self->{txts}->[1]->{height}; 473 $h -= $tex[1]->{height};
350 $h -= $self->{txts}->[4]->{height}; 474 $h -= $tex[4]->{height};
351 $w -= $self->{txts}->[2]->{width}; 475 $w -= $tex[2]->{width};
352 $w -= $self->{txts}->[3]->{width}; 476 $w -= $tex[3]->{width};
353 477
354 $h = $h < 0 ? 0 : $h; 478 $h = $h < 0 ? 0 : $h;
355 $w = $w < 0 ? 0 : $w; 479 $w = $w < 0 ? 0 : $w;
356 warn "CHILD:$w $h\n"; 480
481 my $child = $self->child;
482
357 $self->get->size_allocate ($w, $h); 483 $child->size_allocate ($w, $h);
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 484 $child->move ($tex[3]->{width}, $tex[1]->{height});
359} 485}
360 486
361sub _draw { 487sub _draw {
362 my ($self) = @_; 488 my ($self) = @_;
363 489
364 my ($w, $h) = ($self->w, $self->h); 490 my ($w, $h) = ($self->{w}, $self->{h});
365 my ($cw, $ch) = ($self->get->w, $self->get->h); 491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
366 492
367 glEnable GL_BLEND; 493 glEnable GL_BLEND;
368 glEnable GL_TEXTURE_2D; 494 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371 497
372 my $top = $self->{txts}->[1]; 498 my $top = $tex[1];
373 glBindTexture GL_TEXTURE_2D, $top->{name}; 499 $top->draw_quad (0, 0, $w, $top->{height});
374 500
375 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $top->{height};
378 glTexCoord 1, 1; glVertex $w , $top->{height};
379 glTexCoord 1, 0; glVertex $w , 0;
380 glEnd;
381
382 my $left = $self->{txts}->[3]; 501 my $left = $tex[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name}; 502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
384 503
385 glBegin GL_QUADS;
386 glTexCoord 0, 0; glVertex 0 , $top->{height};
387 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
388 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
389 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
390 glEnd;
391
392 my $right = $self->{txts}->[2]; 504 my $right = $tex[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name}; 505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
394 506
395 glBegin GL_QUADS;
396 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
397 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
398 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
399 glTexCoord 1, 0; glVertex $w , $top->{height};
400 glEnd;
401
402 my $bottom = $self->{txts}->[4]; 507 my $bottom = $tex[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
404 509
405 glBegin GL_QUADS; 510 my $bg = $tex[0];
406 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
407 glTexCoord 0, 1; glVertex 0 , $h;
408 glTexCoord 1, 1; glVertex $w , $h;
409 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
410 glEnd;
411
412 my $bg = $self->{txts}->[0];
413 glBindTexture GL_TEXTURE_2D, $bg->{name}; 511 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417 515
418 my $rep_x = $cw / $bg->{width}; 516 my $rep_x = $cw / $bg->{width};
419 my $rep_y = $ch / $bg->{height}; 517 my $rep_y = $ch / $bg->{height};
420 518
421 glBegin GL_QUADS; 519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
422 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
423 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
425 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
426 glEnd;
427 520
428 glDisable GL_BLEND; 521 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D; 522 glDisable GL_TEXTURE_2D;
430 523
431 $self->get->draw; 524 $self->child->draw;
432 525
433} 526}
434 527
528#############################################################################
529
435package Crossfire::Client::Widget::Table; 530package CFClient::Widget::Table;
436 531
437our @ISA = Crossfire::Client::Widget::Bin::; 532our @ISA = CFClient::Widget::Bin::;
438 533
439use SDL::OpenGL; 534use SDL::OpenGL;
440 535
441sub add { 536sub add {
442 my ($self, $x, $y, $chld) = @_; 537 my ($self, $x, $y, $chld) = @_;
443 my $old_chld = $self->{childs}[$y][$x]; 538 my $old_chld = $self->{children}[$y][$x];
444 539
445 $self->{childs}[$y][$x] = $chld; 540 $self->{children}[$y][$x] = $chld;
446 $chld->set_parent ($self); 541 $chld->set_parent ($self);
447 $self->update; 542 $self->update;
448} 543}
449 544
450sub max_row_height { 545sub max_row_height {
451 my ($self, $row) = @_; 546 my ($self, $row) = @_;
452 547
453 my $hs = 0; 548 my $hs = 0;
454 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
455 my $c = $self->{childs}->[$row]->[$xi]; 550 my $c = $self->{children}->[$row]->[$xi];
456 if ($c) { 551 if ($c) {
457 my ($w, $h) = $c->size_request; 552 my ($w, $h) = $c->size_request;
458 if ($hs < $h) { $hs = $h } 553 if ($hs < $h) { $hs = $h }
459 } 554 }
460 } 555 }
… …
463 558
464sub max_col_width { 559sub max_col_width {
465 my ($self, $col) = @_; 560 my ($self, $col) = @_;
466 561
467 my $ws = 0; 562 my $ws = 0;
468 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
469 my $c = ($self->{childs}->[$yi] || [])->[$col]; 564 my $c = ($self->{children}->[$yi] || [])->[$col];
470 if ($c) { 565 if ($c) {
471 my ($w, $h) = $c->size_request; 566 my ($w, $h) = $c->size_request;
472 if ($ws < $w) { $ws = $w } 567 if ($ws < $w) { $ws = $w }
473 } 568 }
474 } 569 }
… …
478sub size_request { 573sub size_request {
479 my ($self) = @_; 574 my ($self) = @_;
480 575
481 my ($hs, $ws) = (0, 0); 576 my ($hs, $ws) = (0, 0);
482 577
483 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
484 $hs += $self->max_row_height ($yi); 579 $hs += $self->max_row_height ($yi);
485 } 580 }
486 581
487 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
488 my $wm = 0; 583 my $wm = 0;
489 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
490 $wm += $self->max_col_width ($xi) 585 $wm += $self->max_col_width ($xi)
491 } 586 }
492 if ($ws < $wm) { $ws = $wm } 587 if ($ws < $wm) { $ws = $wm }
493 } 588 }
494 589
… …
497 592
498sub _draw { 593sub _draw {
499 my ($self) = @_; 594 my ($self) = @_;
500 595
501 my $y = 0; 596 my $y = 0;
502 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
503 my $x = 0; 598 my $x = 0;
504 599
505 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
506 601
507 my $c = $self->{childs}->[$yi]->[$xi]; 602 my $c = $self->{children}->[$yi]->[$xi];
508 if ($c) { 603 if ($c) {
509 $c->move ($x, $y, 0); #TODO: Move to size_request 604 $c->move ($x, $y, 0); #TODO: Move to size_request
510 $c->draw if $c; 605 $c->draw if $c;
511 } 606 }
512 607
… …
515 610
516 $y += $self->max_row_height ($yi); 611 $y += $self->max_row_height ($yi);
517 } 612 }
518} 613}
519 614
615#############################################################################
616
520package Crossfire::Client::Widget::VBox; 617package CFClient::Widget::VBox;
521 618
522our @ISA = Crossfire::Client::Widget::Bin::; 619our @ISA = CFClient::Widget::Container::;
523 620
524use SDL::OpenGL; 621use SDL::OpenGL;
525 622
526sub add {
527 my ($self, $chld, $expand) = @_;
528 push @{$self->{childs}}, $chld;
529 $chld->{expand} = $expand;
530 $chld->set_parent ($self);
531 $self->update;
532}
533
534sub size_request { 623sub size_request {
535 my ($self) = @_; 624 my ($self) = @_;
536 625
537 my ($hs, $ws) = (0, 0); 626 my @alloc = map [$_->size_request], @{$self->{children}};
538 for (@{$self->{childs} || []}) { 627
539 my ($w, $h) = $_->size_request;
540 $hs += $h;
541 if ($ws < $w) { $ws = $w }
542 } 628 (
543 629 (List::Util::max map $_->[0], @alloc),
544 return ($ws, $hs); 630 (List::Util::sum map $_->[1], @alloc),
631 )
545} 632}
546 633
547sub size_allocate { 634sub size_allocate {
548 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
549 636
… …
551 $self->h ($h); 638 $self->h ($h);
552 639
553 my $exp; 640 my $exp;
554 my @oth; 641 my @oth;
555 # find expand widget 642 # find expand widget
556 for (@{$self->{childs}}) { 643 for (@{$self->{children}}) {
557 if ($_->{expand}) { 644 if ($_->{expand}) {
558 $exp = $_; 645 $exp = $_;
559 last; 646 last;
560 } 647 }
561 push @oth, $_; 648 push @oth, $_;
… …
569 $oh += $h; 656 $oh += $h;
570 if ($ow < $w) { $ow = $w } 657 if ($ow < $w) { $ow = $w }
571 } 658 }
572 659
573 my $y = 0; 660 my $y = 0;
574 for (@{$self->{childs}}) { 661 for (@{$self->{children}}) {
575 $_->move (0, $y); 662 $_->move (0, $y);
576 663
577 if ($_ == $exp) { 664 if ($_ == $exp) {
578 $_->size_allocate ($w, $h - $oh); 665 $_->size_allocate ($w, $h - $oh);
579 $y += $h - $oh; 666 $y += $h - $oh;
… …
583 $y += $h; 670 $y += $h;
584 } 671 }
585 } 672 }
586} 673}
587 674
588sub _draw { 675#############################################################################
589 my ($self) = @_;
590 676
591 my ($x, $y);
592 for (@{$self->{childs} || []}) {
593 $_->draw;
594 $y += $_->h;
595 }
596}
597
598package Crossfire::Client::Widget::Label; 677package CFClient::Widget::Label;
599 678
600our @ISA = Crossfire::Client::Widget::; 679our @ISA = CFClient::Widget::;
601 680
602use SDL::OpenGL; 681use SDL::OpenGL;
603 682
604sub new { 683sub new {
605 my ($class, $x, $y, $z, $height, $text) = @_; 684 my ($class, %arg) = @_;
606 685
607 # TODO: color, and make height, xyz etc. optional 686 # TODO: color, and make height, xyz etc. optional
608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 687 my $self = $class->SUPER::new (
688 color => [1, 1, 1],
689 height => $::FONTSIZE,
690 text => "",
691 layout => new CFClient::Layout,
692 %arg
693 );
609 694
610 $self->set_text ($text); 695 $self->set_text ($self->{text});
611 696
612 $self 697 $self
613} 698}
614 699
615sub set_text { 700sub set_text {
616 my ($self, $text) = @_; 701 my ($self, $text) = @_;
617 702
618 $self->{text} = $text; 703 $self->{text} = $text;
619 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 704 $self->{layout}->set_markup ($text);
620 705
621 $self->update; 706 delete $self->{texture};
622} 707}
623 708
624sub get_text { 709sub get_text {
625 my ($self, $text) = @_; 710 my ($self, $text) = @_;
626 711
… …
628} 713}
629 714
630sub size_request { 715sub size_request {
631 my ($self) = @_; 716 my ($self) = @_;
632 717
633 ( 718 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
722# (
634 $self->{texture}{width}, 723# $self->{texture}{width},
635 $self->{texture}{height}, 724# $self->{texture}{height},
636 ) 725# )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731}
732
733sub size_allocate {
734 my ($self, $w, $h) = @_;
735
736 $self->SUPER::size_allocate ($w, $h);
737 delete $self->{texture};
637} 738}
638 739
639sub _draw { 740sub _draw {
640 my ($self) = @_; 741 my ($self) = @_;
641 742
642 my $tex = $self->{texture}; 743 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w});
745 new_from_layout CFClient::Texture $self->{layout};
746 };
643 747
644 glEnable GL_BLEND; 748 glEnable GL_BLEND;
645 glEnable GL_TEXTURE_2D; 749 glEnable GL_TEXTURE_2D;
646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
648 glBindTexture GL_TEXTURE_2D, $tex->{name};
649 752
650 glColor 1, 0, 0, 1; # TODO color 753 glColor @{$self->{color}};
651 754
652 glBegin GL_QUADS; 755 $tex->draw_quad (0, 0);
653 glTexCoord 0, 0; glVertex 0 , 0;
654 glTexCoord 0, 1; glVertex 0 , $tex->{height};
655 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
656 glTexCoord 1, 0; glVertex $tex->{width}, 0;
657 glEnd;
658 756
659 glDisable GL_BLEND; 757 glDisable GL_BLEND;
660 glDisable GL_TEXTURE_2D; 758 glDisable GL_TEXTURE_2D;
661} 759}
662 760
761#############################################################################
762
663package Crossfire::Client::Widget::TextEntry; 763package CFClient::Widget::Entry;
664 764
665our @ISA = Crossfire::Client::Widget::Label::; 765our @ISA = CFClient::Widget::Label::;
666 766
667use SDL; 767use SDL;
668use SDL::OpenGL; 768use SDL::OpenGL;
669 769
670sub key_down { 770sub key_down {
671 my ($self, $ev) = @_; 771 my ($self, $ev) = @_;
672 772
673 my $mod = $ev->key_mod; 773 my $mod = $ev->key_mod;
674 my $sym = $ev->key_sym; 774 my $sym = $ev->key_sym;
675 775
676 $ev->set_unicode (1);
677 my $uni = $ev->key_unicode; 776 my $uni = $ev->key_unicode;
678 777
679 my $text = $self->get_text; 778 my $text = $self->get_text;
680 779
681 if ($sym == SDLK_BACKSPACE) { 780 if ($sym == SDLK_BACKSPACE) {
682 substr $text, -1, 1, ''; 781 substr $text, -1, 1, '';
683
684 } elsif ($uni) { 782 } elsif ($uni) {
685 $text .= chr $uni; 783 $text .= chr $uni;
686 } 784 }
785
687 $self->set_text ($text); 786 $self->set_text ($text);
688} 787}
689 788
789sub button_down {
790 my ($self, $ev) = @_;
791
792 $self->focus_in;
793}
794
795sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798}
799
800sub _draw {
801 my ($self) = @_;
802
803 if ($FOCUS == $self) {
804 glColor 1, 1, 1;
805 } else {
806 glColor 0.7, 0.7, 0.7;
807 }
808
809 glBegin GL_QUADS;
810 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1;
812 glVertex $self->{w} - 1, $self->{h} - 1;
813 glVertex $self->{w} - 1, 0;
814 glEnd;
815
816 $self->SUPER::_draw;
817}
818
819#############################################################################
820
690package Crossfire::Client::Widget::MapWidget; 821package CFClient::Widget::MapWidget;
691 822
692use strict; 823use strict;
693 824
694use List::Util qw(min max); 825use List::Util qw(min max);
695 826
696use SDL; 827use SDL;
697use SDL::OpenGL; 828use SDL::OpenGL;
698use SDL::OpenGL::Constants; 829use SDL::OpenGL::Constants;
699 830
700our @ISA = Crossfire::Client::Widget::; 831our @ISA = CFClient::Widget::;
832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 z => -1,
838 list => (glGenLists 1),
839 @_
840 )
841}
701 842
702sub key_down { 843sub key_down {
703 print "MAPKEYDOWN\n"; 844 print "MAPKEYDOWN\n";
704} 845}
705 846
706sub key_up { 847sub key_up {
707} 848}
708 849
709sub size_request { 850sub size_request {
710 851 (
852 1 + int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32,
854 )
711} 855}
712 856
713sub size_allocate { 857sub update {
858 my ($self) = @_;
859
860 $self->{need_update} = 1;
714} 861}
715 862
716sub _draw { 863sub _draw {
717 my ($self) = @_; 864 my ($self) = @_;
718 865
866 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE;
868
719 my $mx = $::CONN->{mapx}; 869 my $mx = $::CONN->{mapx};
720 my $my = $::CONN->{mapy}; 870 my $my = $::CONN->{mapy};
721 871
722 my $map = $::CONN->{map}; 872 my $map = $::CONN->{map};
723 873
724 my ($xofs, $yofs); 874 my ($xofs, $yofs);
725 875
726 my $sw = 1 + int $::WIDTH / 32; 876 my $sw = 1 + int $::WIDTH / 32;
727 my $sh = 1 + int $::HEIGHT / 32; 877 my $sh = 1 + int $::HEIGHT / 32;
728 878
729 if ($::CONN->{mapw} > $sw) { 879 if ($::CONN->{mapw} > $sw) {
730 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 880 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
731 } else { 881 } else {
732 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 882 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
733 } 883 }
734 884
735 if ($::CONN->{maph} > $sh) { 885 if ($::CONN->{maph} > $sh) {
736 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 886 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
737 } else { 887 } else {
738 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
739 } 889 }
740 890
741 glEnable GL_TEXTURE_2D; 891 glEnable GL_TEXTURE_2D;
742 glEnable GL_BLEND; 892 glEnable GL_BLEND;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 894
745 my $sw4 = ($sw + 3) & ~3; 895 my $sw4 = ($sw + 3) & ~3;
746 my $lighting = "\x00" x ($sw4 * $sh); 896 my $darkness = "\x00" x ($sw4 * $sh);
747 897
748 for my $x (0 .. $sw - 1) { 898 for my $x (0 .. $sw - 1) {
899 my $row = $map->[$x + $xofs];
749 for my $y (0 .. $sh - 1) { 900 for my $y (0 .. $sh - 1) {
750 901
751 my $cell = $map->[$x + $xofs][$y + $yofs] 902 my $cell = $row->[$y + $yofs]
752 or next; 903 or next;
753 904
754 my $darkness = $cell->[0] * (1 / 255); 905 my $dark = $cell->[0];
755 if ($darkness < 0) { 906 if ($dark < 0) {
756 $darkness = 0.15; 907 substr $darkness, $y * $sw4 + $x, 1, chr 224;
908 } else {
909 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
757 } 910 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
759 911
760 for my $num (grep $_, @$cell[1,2,3]) { 912 for my $num (grep $_, @$cell[1,2,3]) {
761 my $tex = $::CONN->{face}[$num]{texture} || next; 913 my $tex = $::CONN->{face}[$num]{texture} || next;
762 914
763 glBindTexture GL_TEXTURE_2D, $tex->{name};
764
765 my $w = $tex->{width}; 915 my $w = $tex->{width};
766 my $h = $tex->{height}; 916 my $h = $tex->{height};
767 917
768 my $px = ($x + 1) * 32 - $w; 918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
769 my $py = ($y + 1) * 32 - $h;
770
771 glBegin GL_QUADS;
772 glTexCoord 0, 0; glVertex $px , $py;
773 glTexCoord 0, 1; glVertex $px , $py + $h;
774 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
775 glTexCoord 1, 0; glVertex $px + $w, $py;
776 glEnd; 919 }
777 } 920 }
778 } 921 }
779 }
780 922
781# if (1) { # higher quality darkness 923# if (1) { # higher quality darkness
782# $lighting =~ s/(.)/$1$1$1/gs; 924# $lighting =~ s/(.)/$1$1$1/gs;
783# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 925# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
784# 926#
… …
786# 928#
787# $lighting = $pb->get_pixels; 929# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs; 930# $lighting =~ s/(.)../$1/gs;
789# } 931# }
790 932
791 $lighting = new Crossfire::Client::Texture
792 width => $sw4,
793 height => $sh,
794 data => $lighting,
795 internalformat => GL_ALPHA4,
796 format => GL_ALPHA;
797
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glColor 0, 0, 0, 0.75;
800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
801 glBindTexture GL_TEXTURE_2D, $lighting->{name};
802 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex 0 , 0;
805 glTexCoord 0, 1; glVertex 0 , $sh * 32;
806 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
807 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
808 glEnd;
809 935
936 $darkness = new CFClient::Texture
937 width => $sw4,
938 height => $sh,
939 data => $darkness,
940 internalformat => GL_ALPHA,
941 format => GL_ALPHA;
942
943 glColor 0.45, 0.45, 0.45, 1;
944 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
945
810 glDisable GL_TEXTURE_2D; 946 glDisable GL_TEXTURE_2D;
811 glDisable GL_BLEND; 947 glDisable GL_BLEND;
948
949 glEndList;
950 }
951
952 glCallList $self->{list};
812} 953}
813 954
814my %DIR = ( 955my %DIR = (
815 SDLK_KP8, [1, "north"], 956 SDLK_KP8, [1, "north"],
816 SDLK_KP9, [2, "northeast"], 957 SDLK_KP9, [2, "northeast"],
… …
860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1001 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
861 $::CONN->send ("command run_stop"); 1002 $::CONN->send ("command run_stop");
862 } 1003 }
863} 1004}
864 1005
1006#############################################################################
1007
865package Crossfire::Client::Widget::Animator; 1008package CFClient::Widget::Animator;
866 1009
867use SDL::OpenGL; 1010use SDL::OpenGL;
868 1011
869our @ISA = Crossfire::Client::Widget::Bin::; 1012our @ISA = CFClient::Widget::Bin::;
870 1013
871sub moveto { 1014sub moveto {
872 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
873 1016
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.01; 1018 $self->{speed} = 0.001;
876 $self->{time} = 1; 1019 $self->{time} = 1;
877 1020
878 ::animation_start $self; 1021 ::animation_start $self;
879} 1022}
880 1023
… …
895 1038
896sub _draw { 1039sub _draw {
897 my ($self) = @_; 1040 my ($self) = @_;
898 1041
899 glPushMatrix; 1042 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0; 1043 glRotate $self->{time} * 1000, 0, 1, 0;
901 $self->{child}->draw; 1044 $self->{children}[0]->draw;
902 glPopMatrix; 1045 glPopMatrix;
903} 1046}
904 1047
9051; 1048#############################################################################
906 1049
1050package CFClient::Widget::Toplevel;
1051
1052our @ISA = CFClient::Widget::Container::;
1053
1054sub size_request {
1055 ($::WIDTH, $::HEIGHT)
1056}
1057
1058sub size_allocate {
1059 my ($self, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($w, $h);
1062
1063 $_->size_allocate ($_->size_request)
1064 for @{$self->{children}};
1065}
1066
1067sub translate {
1068 my ($self, $x, $y) = @_;
1069
1070 ($x, $y)
1071}
1072
1073sub update {
1074 my ($self) = @_;
1075
1076 $self->size_allocate ($self->size_request);
1077 ::refresh ();
1078}
1079
1080sub add {
1081 my ($self, $widget) = @_;
1082
1083 $self->SUPER::add ($widget);
1084
1085 $widget->size_allocate ($widget->size_request);
1086}
1087
1088sub draw {
1089 my ($self) = @_;
1090
1091 $self->_draw;
1092}
1093
1094#############################################################################
1095
1096package CFClient::Widget;
1097
1098$TOPLEVEL = new CFClient::Widget::Toplevel;
1099
11001
1101

Diff Legend

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