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.47 by root, Sun Apr 9 22:24:43 2006 UTC vs.
Revision 1.69 by root, Tue Apr 11 17:32:14 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
10use Crossfire::Client; 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;
… …
42 104
43 $self->{w} = $w; 105 $self->{w} = $w;
44 $self->{h} = $h; 106 $self->{h} = $h;
45} 107}
46 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});
114}
115
47sub focus_in { 116sub focus_in {
48 my ($widget) = @_; 117 my ($self) = @_;
49 $::FOCUS = $widget; 118
119 return if $FOCUS == $self;
120
121 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus;
123 $FOCUS->update;
50} 124}
51 125
52sub focus_out { 126sub focus_out {
53 my ($widget) = @_; 127 my ($self) = @_;
54}
55 128
129 return unless $FOCUS == $self;
130
131 my $focus = $FOCUS; undef $FOCUS;
132 $focus->update if $focus; #?
133}
134
135sub mouse_motion { }
136sub button_up { }
56sub key_down { 137sub key_down { }
57 my ($widget, $sdlev) = @_;
58}
59
60sub key_up { 138sub key_up { }
61 my ($widget, $sdlev) = @_;
62}
63 139
64sub button_down { 140sub button_down {
65 my ($widget, $sdlev) = @_; 141 my ($self, $ev, $x, $y) = @_;
66}
67 142
68sub button_up { 143 $self->focus_in;
69 my ($widget, $sdlev) = @_;
70} 144}
71 145
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 151
78sub draw { 152sub draw {
79 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
80 156
81 glPushMatrix; 157 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 159 $self->_draw;
84 if ($self == $::HOVER) { 160 if ($self == $HOVER) {
85 glColor 1, 1, 1, 1; 161 glColor 1, 1, 1, 0.4;
162 glEnable GL_BLEND;
86 glBegin GL_LINES; 163 glBegin GL_QUADS;
87 glVertex 0, 0; 164 glVertex 0 , 0;
88 glVertex $self->{w} - 1, 0; 165 glVertex $self->{w}, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1; 166 glVertex $self->{w}, $self->{h};
90 glVertex 0, $self->{h} - 1; 167 glVertex 0 , $self->{h};
91 glVertex 0, 0;
92 glEnd; 168 glEnd;
169 glDisable GL_BLEND;
93 } 170 }
94 glPopMatrix; 171 glPopMatrix;
95} 172}
96 173
97sub _draw { 174sub _draw {
… …
147 #$self->deactivate; 224 #$self->deactivate;
148} 225}
149 226
150############################################################################# 227#############################################################################
151 228
152package Crossfire::Client::Widget::Container; 229package CFClient::Widget::DrawBG;
153 230
154our @ISA = Crossfire::Client::Widget::; 231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
155 235
156sub new { 236sub new {
237 my $class = shift;
238
239 # range [value, low, high, page]
240
241 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4],
243 active_bg => [1, 1, 1],
244 @_
245 )
246}
247
248sub _draw {
249 my ($self) = @_;
250
251 my ($w, $h) = @$self{qw(w h)};
252
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
254 glBegin GL_QUADS;
255 glVertex 0 , 0;
256 glVertex 0 , $h;
257 glVertex $w, $h;
258 glVertex $w, 0;
259 glEnd;
260}
261
262#############################################################################
263
264package CFClient::Widget::Empty;
265
266our @ISA = CFClient::Widget::;
267
268sub size_request {
269 (0, 0)
270}
271
272sub draw { }
273
274#############################################################################
275
276package CFClient::Widget::Container;
277
278our @ISA = CFClient::Widget::;
279
280sub new {
157 my ($class, @widgets) = @_; 281 my ($class, %arg) = @_;
158 282
283 my $children = delete $arg{children} || [];
284
159 my $self = $class->SUPER::new (children => []); 285 my $self = $class->SUPER::new (children => [], %arg);
160 $self->add ($_) for @widgets; 286 $self->add ($_) for @$children;
161 287
162 $self 288 $self
163} 289}
164 290
165sub add { 291sub add {
166 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
167 293
168 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
169 $chld->set_parent ($self); 295 $chld->set_parent ($self);
170 296
171 @{$self->{children}} = 297 $self->{children} = [
172 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
173 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
174 301
175 $self->size_allocate ($self->{w}, $self->{h}) 302 $self->size_allocate ($self->{w}, $self->{h})
176 if $self->{w}; #TODO: check for "realised state" 303 if $self->{w}; #TODO: check for "realised state"
177} 304}
178 305
… …
206 $_->draw for @{$self->{children}}; 333 $_->draw for @{$self->{children}};
207} 334}
208 335
209############################################################################# 336#############################################################################
210 337
211package Crossfire::Client::Widget::Bin; 338package CFClient::Widget::Bin;
212 339
213our @ISA = Crossfire::Client::Widget::Container::; 340our @ISA = CFClient::Widget::Container::;
341
342sub new {
343 my ($class, %arg) = @_;
344
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
346
347 $class->SUPER::new (children => [$child], %arg)
348}
349
350sub add {
351 my ($self, $widget) = @_;
352
353 $self->{children} = [];
354
355 $self->SUPER::add ($widget);
356}
357
358sub remove {
359 my ($self, $widget) = @_;
360
361 $self->SUPER::remove ($widget);
362
363 $self->{children} = [new CFClient::Widget::Empty]
364 unless @{$self->{children}};
365}
214 366
215sub child { $_[0]->{children}[0] } 367sub child { $_[0]->{children}[0] }
216 368
217sub size_request { 369sub size_request {
218 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
219} 371}
220 372
221sub size_allocate { 373sub size_allocate {
222 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
223 375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
224 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
226 if $self->{children}[0]
227} 380}
228 381
229############################################################################# 382#############################################################################
230 383
231package Crossfire::Client::Widget::Toplevel; 384package CFClient::Widget::Window;
232 385
233our @ISA = Crossfire::Client::Widget::Container::; 386our @ISA = CFClient::Widget::Bin::;
387
388use SDL::OpenGL;
389
390sub new {
391 my ($class, %arg) = @_;
392
393 my $self = $class->SUPER::new (%arg);
394}
234 395
235sub update { 396sub update {
236 my ($self) = @_; 397 my ($self) = @_;
237 398
238 ::refresh (); 399 # we want to do this delayed...
239}
240
241sub add {
242 my ($self, $widget) = @_;
243
244 $self->SUPER::add ($widget);
245
246 $widget->size_allocate ($widget->size_request);
247}
248
249#############################################################################
250
251package Crossfire::Client::Widget::Window;
252
253our @ISA = Crossfire::Client::Widget::Bin::;
254
255use SDL::OpenGL;
256
257sub new {
258 my ($class, $x, $y, $z, $w, $h) = @_;
259
260 my $self = $class->SUPER::new;
261
262 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
263}
264
265sub update {
266 my ($self) = @_;
267
268 $self->render_chld; 400 $self->render_chld;
269 $self->SUPER::update; 401 $self->SUPER::update;
270} 402}
271 403
272sub render_chld { 404sub render_chld {
273 my ($self) = @_; 405 my ($self) = @_;
274 406
275 $self->{texture} = 407 $self->{texture} =
276 Crossfire::Client::Texture->new_from_opengl ( 408 CFClient::Texture->new_from_opengl (
277 $self->{w}, $self->{h}, sub { $self->child->draw } 409 $self->{w}, $self->{h}, sub { $self->child->draw }
278 ); 410 );
279} 411}
280 412
281sub size_allocate { 413sub size_allocate {
282 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
415
416 return unless $self->{w} != $w || $self->{h} != $h;
283 417
284 $self->{w} = $w; 418 $self->{w} = $w;
285 $self->{h} = $h; 419 $self->{h} = $h;
286 420
287 $self->child->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
… …
298 or return; 432 or return;
299 433
300 glEnable GL_BLEND; 434 glEnable GL_BLEND;
301 glEnable GL_TEXTURE_2D; 435 glEnable GL_TEXTURE_2D;
302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
303 glBindTexture GL_TEXTURE_2D, $tex->{name};
304 437
305 glBegin GL_QUADS; 438 $tex->draw_quad (0, 0, $w, $h);
306 glTexCoord 0, 0; glVertex 0, 0;
307 glTexCoord 0, 1; glVertex 0, $h;
308 glTexCoord 1, 1; glVertex $w, $h;
309 glTexCoord 1, 0; glVertex $w, 0;
310 glEnd;
311 439
312 glDisable GL_BLEND; 440 glDisable GL_BLEND;
313 glDisable GL_TEXTURE_2D; 441 glDisable GL_TEXTURE_2D;
314} 442}
315 443
316############################################################################# 444#############################################################################
317 445
318package Crossfire::Client::Widget::Frame; 446package CFClient::Widget::Frame;
319 447
320our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
321 449
322use SDL::OpenGL; 450use SDL::OpenGL;
323 451
324sub size_request { 452sub size_request {
325 my ($self) = @_; 453 my ($self) = @_;
… …
332} 460}
333 461
334sub size_allocate { 462sub size_allocate {
335 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
336 464
465 return unless $self->{w} != $w || $self->{h} != $h;
466
337 $self->{w} = $w; 467 $self->{w} = $w;
338 $self->{h} = $h; 468 $self->{h} = $h;
339 469
340 $self->child->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
341 $self->child->move (2, 2); 471 $self->child->move (2, 2);
… …
348 478
349 my ($w, $h) = $chld->size_request; 479 my ($w, $h) = $chld->size_request;
350 480
351 glBegin GL_QUADS; 481 glBegin GL_QUADS;
352 glColor 0, 0, 0; 482 glColor 0, 0, 0;
353 glTexCoord 0, 0; glVertex 0 , 0; 483 glVertex 0 , 0;
354 glTexCoord 0, 1; glVertex 0 , $h + 4; 484 glVertex 0 , $h + 4;
355 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 485 glVertex $w + 4 , $h + 4;
356 glTexCoord 1, 0; glVertex $w + 4 , 0; 486 glVertex $w + 4 , 0;
357 glEnd; 487 glEnd;
358 488
359 $chld->draw; 489 $chld->draw;
360} 490}
361 491
362############################################################################# 492#############################################################################
363 493
364package Crossfire::Client::Widget::FancyFrame; 494package CFClient::Widget::FancyFrame;
365 495
366our @ISA = Crossfire::Client::Widget::Bin::; 496our @ISA = CFClient::Widget::Bin::;
367 497
368use SDL::OpenGL; 498use SDL::OpenGL;
369 499
370my @tex = 500my @tex =
371 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
372 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
373 503
374sub size_request { 504sub size_request {
375 my ($self) = @_; 505 my ($self) = @_;
376 506
… …
385} 515}
386 516
387sub size_allocate { 517sub size_allocate {
388 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
389 519
520 return unless $self->{w} != $w || $self->{h} != $h;
521
390 $self->SUPER::size_allocate ($w, $h); 522 $self->SUPER::size_allocate ($w, $h);
391 523
392 $h -= $tex[1]->{height}; 524 $h -= $tex[1]->{height};
393 $h -= $tex[4]->{height}; 525 $h -= $tex[4]->{height};
394 $w -= $tex[2]->{width}; 526 $w -= $tex[2]->{width};
395 $w -= $tex[3]->{width}; 527 $w -= $tex[3]->{width};
396 528
397 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
398 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
399 531
532 my $child = $self->child;
533
400 $self->child->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
401 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
402} 536}
403 537
404sub _draw { 538sub _draw {
405 my ($self) = @_; 539 my ($self) = @_;
406 540
… …
411 glEnable GL_TEXTURE_2D; 545 glEnable GL_TEXTURE_2D;
412 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
414 548
415 my $top = $tex[1]; 549 my $top = $tex[1];
416 glBindTexture GL_TEXTURE_2D, $top->{name}; 550 $top->draw_quad (0, 0, $w, $top->{height});
417
418 glBegin GL_QUADS;
419 glTexCoord 0, 0; glVertex 0 , 0;
420 glTexCoord 0, 1; glVertex 0 , $top->{height};
421 glTexCoord 1, 1; glVertex $w , $top->{height};
422 glTexCoord 1, 0; glVertex $w , 0;
423 glEnd;
424 551
425 my $left = $tex[3]; 552 my $left = $tex[3];
426 glBindTexture GL_TEXTURE_2D, $left->{name}; 553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
427
428 glBegin GL_QUADS;
429 glTexCoord 0, 0; glVertex 0 , $top->{height};
430 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
431 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
432 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
433 glEnd;
434 554
435 my $right = $tex[2]; 555 my $right = $tex[2];
436 glBindTexture GL_TEXTURE_2D, $right->{name}; 556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
437
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
440 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $w , $top->{height};
443 glEnd;
444 557
445 my $bottom = $tex[4]; 558 my $bottom = $tex[4];
446 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
447
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
450 glTexCoord 0, 1; glVertex 0 , $h;
451 glTexCoord 1, 1; glVertex $w , $h;
452 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
453 glEnd;
454 560
455 my $bg = $tex[0]; 561 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name}; 562 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460 566
461 my $rep_x = $cw / $bg->{width}; 567 my $rep_x = $cw / $bg->{width};
462 my $rep_y = $ch / $bg->{height}; 568 my $rep_y = $ch / $bg->{height};
463 569
464 glBegin GL_QUADS; 570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
465 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
466 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
467 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
468 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
469 glEnd;
470 571
471 glDisable GL_BLEND; 572 glDisable GL_BLEND;
472 glDisable GL_TEXTURE_2D; 573 glDisable GL_TEXTURE_2D;
473 574
474 $self->child->draw; 575 $self->child->draw;
475 576
476} 577}
477 578
478############################################################################# 579#############################################################################
479 580
480package Crossfire::Client::Widget::Table; 581package CFClient::Widget::Table;
481 582
482our @ISA = Crossfire::Client::Widget::Bin::; 583our @ISA = CFClient::Widget::Bin::;
483 584
484use SDL::OpenGL; 585use SDL::OpenGL;
485 586
486sub add { 587sub add {
487 my ($self, $x, $y, $chld) = @_; 588 my ($self, $x, $y, $chld) = @_;
… …
562 } 663 }
563} 664}
564 665
565############################################################################# 666#############################################################################
566 667
567package Crossfire::Client::Widget::VBox; 668package CFClient::Widget::VBox;
568 669
569our @ISA = Crossfire::Client::Widget::Container::; 670our @ISA = CFClient::Widget::Container::;
570 671
571use SDL::OpenGL; 672use SDL::OpenGL;
572 673
573sub size_request { 674sub size_request {
574 my ($self) = @_; 675 my ($self) = @_;
… …
582} 683}
583 684
584sub size_allocate { 685sub size_allocate {
585 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
586 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
587 $self->w ($w); 690 $self->{w} = $w;
588 $self->h ($h); 691 $self->{h} = $h;
589 692
590 my $exp; 693 return unless $self->{h};
591 my @oth; 694
592 # find expand widget 695 my $children = $self->{children};
593 for (@{$self->{children}}) { 696
594 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
595 $exp = $_; 698
596 last; 699 my $req_h = List::Util::sum @h;
700
701 if ($req_h > $h) {
702 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h;
704 } else {
705 my @exp = grep $_->{expand}, @$children;
706 @exp = @$children unless @exp;
707
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) {
711 my $child = $children->[$_];
712
713 my $alloc_h = $h[$_];
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
597 } 716 }
598 push @oth, $_;
599 }
600
601 my ($ow, $oh);
602
603 # get sizes of other widgets
604 for (@oth) {
605 my ($w, $h) = $_->size_request;
606 $oh += $h;
607 if ($ow < $w) { $ow = $w }
608 } 717 }
609 718
610 my $y = 0; 719 my $y = 0;
611 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
612 $_->move (0, $y); 723 $child->move (0, $y);
613
614 if ($_ == $exp) {
615 $_->size_allocate ($w, $h - $oh);
616 $y += $h - $oh;
617 } else {
618 my ($cw, $h) = $_->size_request;
619 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
620 $y += $h; 726 $y += $h;
621 }
622 } 727 }
623} 728}
624 729
625############################################################################# 730#############################################################################
626 731
627package Crossfire::Client::Widget::Label; 732package CFClient::Widget::Label;
628 733
629our @ISA = Crossfire::Client::Widget::; 734our @ISA = CFClient::Widget::;
630 735
631use SDL::OpenGL; 736use SDL::OpenGL;
632 737
633sub new { 738sub new {
634 my ($class, $x, $y, $z, $height, $text) = @_; 739 my ($class, %arg) = @_;
635 740
636 # TODO: color, and make height, xyz etc. optional 741 my $self = $class->SUPER::new (
637 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 742 fg => [1, 1, 1],
743 height => $::FONTSIZE,
744 text => "",
745 layout => new CFClient::Layout,
746 %arg
747 );
638 748
639 $self->set_text ($text); 749 $self->set_text ($self->{text});
640 750
641 $self 751 $self
752}
753
754sub escape_text {
755 local $_ = $_[1];
756
757 s/&/&amp;/g;
758 s/>/&gt;/g;
759 s/</&lt;/g;
760
761 $_[1]
642} 762}
643 763
644sub set_text { 764sub set_text {
645 my ($self, $text) = @_; 765 my ($self, $text) = @_;
646 766
647 $self->{text} = $text; 767 $self->{text} = $text;
648 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 768 $self->{layout}->set_markup ($text);
649 769
770 delete $self->{texture};
650 $self->update; 771 $self->update;
651} 772}
652 773
653sub get_text { 774sub get_text {
654 my ($self, $text) = @_; 775 my ($self, $text) = @_;
… …
657} 778}
658 779
659sub size_request { 780sub size_request {
660 my ($self) = @_; 781 my ($self) = @_;
661 782
662 ( 783 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size
786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
787# (
663 $self->{texture}{width}, 788# $self->{texture}{width},
664 $self->{texture}{height}, 789# $self->{texture}{height},
665 ) 790# )
791# } else {
792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793#
794# ($w, $h)
795# }
796}
797
798sub size_allocate {
799 my ($self, $w, $h) = @_;
800
801 return unless $self->{w} != $w || $self->{h} != $h;
802
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture};
805}
806
807sub update {
808 my ($self) = @_;
809
810 delete $self->{texture};
811 $self->SUPER::update;
666} 812}
667 813
668sub _draw { 814sub _draw {
669 my ($self) = @_; 815 my ($self) = @_;
670 816
671 my $tex = $self->{texture}; 817 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w});
819 new_from_layout CFClient::Texture $self->{layout};
820 };
672 821
673 glEnable GL_BLEND; 822 glEnable GL_BLEND;
674 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
677 glBindTexture GL_TEXTURE_2D, $tex->{name};
678 826
679 glColor 1, 0, 0, 1; # TODO color 827 glColor @{$self->{fg}};
680 828
681 glBegin GL_QUADS; 829 $tex->draw_quad (0, 0);
682 glTexCoord 0, 0; glVertex 0 , 0;
683 glTexCoord 0, 1; glVertex 0 , $tex->{height};
684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
685 glTexCoord 1, 0; glVertex $tex->{width}, 0;
686 glEnd;
687 830
688 glDisable GL_BLEND; 831 glDisable GL_BLEND;
689 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
690} 833}
691 834
692############################################################################# 835#############################################################################
693 836
694package Crossfire::Client::Widget::TextEntry; 837package CFClient::Widget::Entry;
695 838
696our @ISA = Crossfire::Client::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
697 840
698use SDL; 841use SDL;
699use SDL::OpenGL; 842use SDL::OpenGL;
700 843
844sub new {
845 my $class = shift;
846
847 $class->SUPER::new (
848 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4],
850 active_bg => [1, 1, 1],
851 active_fg => [0, 0, 0],
852 @_
853 )
854}
855
856sub _set_text {
857 my ($self, $text) = @_;
858
859 $self->{last_activity} = $::NOW;
860
861 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w});
863 $self->{layout}->set_markup ($self->escape_text ($text));
864
865 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text;
867
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
869}
870
871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = $self->SUPER::size_request;
875
876 ($w + 1, $h) # add 1 for cursor
877}
878
879sub size_allocate {
880 my ($self, $w, $h) = @_;
881
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 $self->_set_text ($self->{text});
887}
888
889sub set_text {
890 my ($self, $text) = @_;
891
892 $self->{cursor} = length $text;
893 $self->_set_text ($text);
894 $self->update;
895}
896
701sub key_down { 897sub key_down {
702 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
703 899
704 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
705 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
706 902
707 $ev->set_unicode (1);
708 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
709 904
710 my $text = $self->get_text; 905 my $text = $self->get_text;
711 906
712 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
713 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
714 909 } elsif ($sym == SDLK_DELETE) {
910 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text};
715 } elsif ($uni) { 915 } elsif ($uni) {
716 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
717 } 917 }
918
718 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
719} 921}
720 922
721############################################################################# 923sub focus_in {
924 my ($self) = @_;
722 925
926 $self->{last_activity} = $::NOW;
927
928 $self->SUPER::focus_in;
929}
930
931sub button_down {
932 my ($self, $ev, $x, $y) = @_;
933
934 $self->SUPER::button_down ($ev, $x, $y);
935
936 my $idx = $self->{layout}->xy_to_index ($x, $y);
937
938 # byte-index to char-index
939 my $text = $self->{layout};
940 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx;
942
943 $self->_set_text ($self->{text});
944 $self->update;
945}
946
947sub mouse_motion {
948 my ($self, $ev, $x, $y) = @_;
949# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
950}
951
952sub _draw {
953 my ($self) = @_;
954
955 local $self->{fg} = $self->{fg};
956
957 if ($FOCUS == $self) {
958 glColor @{$self->{active_bg}};
959 $self->{fg} = $self->{active_fg};
960 } else {
961 glColor @{$self->{bg}};
962 }
963
964 glBegin GL_QUADS;
965 glVertex 0 , 0;
966 glVertex 0 , $self->{h};
967 glVertex $self->{w}, $self->{h};
968 glVertex $self->{w}, 0;
969 glEnd;
970
971 $self->SUPER::_draw;
972
973 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
975 glColor @{$self->{fg}};
976 glBegin GL_LINES;
977 glVertex $self->{cur_x}, $self->{cur_y};
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd;
980 }
981}
982
983#############################################################################
984
985package CFClient::Widget::Slider;
986
987use strict;
988
989use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991
992our @ISA = CFClient::Widget::DrawBG::;
993
994sub size_request {
995 my ($self) = @_;
996
997 my $w = 20;
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002
1003sub new {
1004 my $class = shift;
1005
1006 # range [value, low, high, page]
1007
1008 $class->SUPER::new (
1009 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10],
1012 vertical => 0,
1013 @_
1014 )
1015}
1016
1017sub button_down {
1018 my ($self, $ev, $x, $y) = @_;
1019
1020 $self->SUPER::button_down ($ev, $x, $y);
1021 $self->mouse_motion ($ev, $x, $y);
1022}
1023
1024sub mouse_motion {
1025 my ($self, $ev, $x, $y) = @_;
1026
1027 if ($GRAB == $self) {
1028 my ($value, $lo, $hi, $page) = @{$self->{range}};
1029
1030 $x = $x * ($hi - $lo) / $self->{w} + $lo;
1031 $x = $lo if $x < $lo;
1032 $x = $hi - $page if $x > $hi - $page;
1033 $self->{range}[0] = $x;
1034
1035 $self->{changed}($x) if $self->{changed};
1036 $self->update;
1037 }
1038}
1039
1040sub _draw {
1041 my ($self) = @_;
1042
1043 $self->SUPER::_draw ();
1044
1045 glPushMatrix;
1046
1047 my ($w, $h) = @$self{qw(w h)};
1048
1049 if ($self->{vertical}) {
1050 # draw a vertical slider like a rotated horizontal slider
1051
1052 glTranslate 0, $self->{w};
1053 glRotate 90, 0, 0, 1;
1054
1055 ($w, $h) = ($h, $w);
1056 }
1057
1058 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1059 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1060
1061 my ($value, $lo, $hi, $page) = @{$self->{range}};
1062
1063 $page = int $page * $w / ($hi - $lo);
1064 $value = int +($value - $lo) * $w / ($hi - $lo);
1065
1066 $w -= $page;
1067 $page &= ~1;
1068 glTranslate $page * 0.5, 0, 0;
1069
1070 glColor @$fg;
1071 glBegin GL_LINES;
1072 glVertex 0, 0; glVertex 0, $h;
1073 glVertex $w - 1, 0; glVertex $w - 1, $h;
1074 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1075 glEnd;
1076
1077 my $knob_a = $value - $page * 0.5;
1078 my $knob_b = $value + $page * 0.5;
1079
1080 glBegin GL_QUADS;
1081 glColor @$fg;
1082 glVertex $knob_a, 0;
1083 glVertex $knob_a, $h;
1084 glVertex $knob_b, $h;
1085 glVertex $knob_b, 0;
1086
1087 if ($knob_a < $knob_b - 2) {
1088 glColor @$bg;
1089 glVertex $knob_a + 1, 1;
1090 glVertex $knob_a + 1, $h - 1;
1091 glVertex $knob_b - 1, $h - 1;
1092 glVertex $knob_b - 1, 1;
1093 }
1094 glEnd;
1095
1096 glPopMatrix;
1097}
1098
1099#############################################################################
1100
723package Crossfire::Client::Widget::MapWidget; 1101package CFClient::Widget::MapWidget;
724 1102
725use strict; 1103use strict;
726 1104
727use List::Util qw(min max); 1105use List::Util qw(min max);
728 1106
729use SDL; 1107use SDL;
730use SDL::OpenGL; 1108use SDL::OpenGL;
731use SDL::OpenGL::Constants; 1109use SDL::OpenGL::Constants;
732 1110
733our @ISA = Crossfire::Client::Widget::; 1111our @ISA = CFClient::Widget::;
1112
1113sub new {
1114 my $class = shift;
1115
1116 $class->SUPER::new (
1117 z => -1,
1118 list => (glGenLists 1),
1119 @_
1120 )
1121}
734 1122
735sub key_down { 1123sub key_down {
736 print "MAPKEYDOWN\n"; 1124 print "MAPKEYDOWN\n";
737} 1125}
738 1126
739sub key_up { 1127sub key_up {
740} 1128}
741 1129
742sub size_request { 1130sub size_request {
743 1131 (
1132 1 + int $::WIDTH / 32,
1133 1 + int $::HEIGHT / 32,
1134 )
744} 1135}
745 1136
746sub size_allocate { 1137sub update {
1138 my ($self) = @_;
1139
1140 $self->{need_update} = 1;
747} 1141}
748 1142
749sub _draw { 1143sub _draw {
750 my ($self) = @_; 1144 my ($self) = @_;
751 1145
1146 if (delete $self->{need_update}) {
1147 glNewList $self->{list}, GL_COMPILE;
1148
752 my $mx = $::CONN->{mapx}; 1149 my $mx = $::CONN->{mapx};
753 my $my = $::CONN->{mapy}; 1150 my $my = $::CONN->{mapy};
754 1151
755 my $map = $::CONN->{map}; 1152 my $map = $::CONN->{map};
756 1153
757 my ($xofs, $yofs); 1154 my ($xofs, $yofs);
758 1155
759 my $sw = 1 + int $::WIDTH / 32; 1156 my $sw = 1 + int $::WIDTH / 32;
760 my $sh = 1 + int $::HEIGHT / 32; 1157 my $sh = 1 + int $::HEIGHT / 32;
761 1158
762 if ($::CONN->{mapw} > $sw) { 1159 if ($::CONN->{mapw} > $sw) {
763 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1160 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
764 } else { 1161 } else {
765 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1162 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
766 } 1163 }
767 1164
768 if ($::CONN->{maph} > $sh) { 1165 if ($::CONN->{maph} > $sh) {
769 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1166 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
770 } else { 1167 } else {
771 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1168 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
772 } 1169 }
773 1170
774 glEnable GL_TEXTURE_2D; 1171 glEnable GL_TEXTURE_2D;
775 glEnable GL_BLEND; 1172 glEnable GL_BLEND;
776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1173 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
777 1174
778 my $sw4 = ($sw + 3) & ~3; 1175 my $sw4 = ($sw + 3) & ~3;
779 my $lighting = "\x00" x ($sw4 * $sh); 1176 my $darkness = "\x00" x ($sw4 * $sh);
780 1177
781 for my $x (0 .. $sw - 1) { 1178 for my $x (0 .. $sw - 1) {
1179 my $row = $map->[$x + $xofs];
782 for my $y (0 .. $sh - 1) { 1180 for my $y (0 .. $sh - 1) {
783 1181
784 my $cell = $map->[$x + $xofs][$y + $yofs] 1182 my $cell = $row->[$y + $yofs]
785 or next; 1183 or next;
786 1184
787 my $darkness = $cell->[0] * (1 / 255); 1185 my $dark = $cell->[0];
788 if ($darkness < 0) { 1186 if ($dark < 0) {
789 $darkness = 0.15; 1187 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188 } else {
1189 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
790 } 1190 }
791 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
792 1191
793 for my $num (grep $_, @$cell[1,2,3]) { 1192 for my $num (grep $_, @$cell[1,2,3]) {
794 my $tex = $::CONN->{face}[$num]{texture} || next; 1193 my $tex = $::CONN->{face}[$num]{texture} || next;
795 1194
796 glBindTexture GL_TEXTURE_2D, $tex->{name};
797
798 my $w = $tex->{width}; 1195 my $w = $tex->{width};
799 my $h = $tex->{height}; 1196 my $h = $tex->{height};
800 1197
801 my $px = ($x + 1) * 32 - $w; 1198 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
802 my $py = ($y + 1) * 32 - $h;
803
804 glBegin GL_QUADS;
805 glTexCoord 0, 0; glVertex $px , $py;
806 glTexCoord 0, 1; glVertex $px , $py + $h;
807 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
808 glTexCoord 1, 0; glVertex $px + $w, $py;
809 glEnd; 1199 }
810 } 1200 }
811 } 1201 }
812 }
813 1202
814# if (1) { # higher quality darkness 1203# if (1) { # higher quality darkness
815# $lighting =~ s/(.)/$1$1$1/gs; 1204# $lighting =~ s/(.)/$1$1$1/gs;
816# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1205# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
817# 1206#
… …
819# 1208#
820# $lighting = $pb->get_pixels; 1209# $lighting = $pb->get_pixels;
821# $lighting =~ s/(.)../$1/gs; 1210# $lighting =~ s/(.)../$1/gs;
822# } 1211# }
823 1212
824 $lighting = new Crossfire::Client::Texture
825 width => $sw4,
826 height => $sh,
827 data => $lighting,
828 internalformat => GL_ALPHA4,
829 format => GL_ALPHA;
830
831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1213 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
832 glColor 0, 0, 0, 0.75;
833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
834 glBindTexture GL_TEXTURE_2D, $lighting->{name};
835 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
836 glBegin GL_QUADS;
837 glTexCoord 0, 0; glVertex 0 , 0;
838 glTexCoord 0, 1; glVertex 0 , $sh * 32;
839 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
840 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
841 glEnd;
842 1215
1216 $darkness = new CFClient::Texture
1217 width => $sw4,
1218 height => $sh,
1219 data => $darkness,
1220 internalformat => GL_ALPHA,
1221 format => GL_ALPHA;
1222
1223 glColor 0.45, 0.45, 0.45, 1;
1224 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1225
843 glDisable GL_TEXTURE_2D; 1226 glDisable GL_TEXTURE_2D;
844 glDisable GL_BLEND; 1227 glDisable GL_BLEND;
1228
1229 glEndList;
1230 }
1231
1232 glCallList $self->{list};
845} 1233}
846 1234
847my %DIR = ( 1235my %DIR = (
848 SDLK_KP8, [1, "north"], 1236 SDLK_KP8, [1, "north"],
849 SDLK_KP9, [2, "northeast"], 1237 SDLK_KP9, [2, "northeast"],
… …
895 } 1283 }
896} 1284}
897 1285
898############################################################################# 1286#############################################################################
899 1287
900package Crossfire::Client::Widget::Animator; 1288package CFClient::Widget::Animator;
901 1289
902use SDL::OpenGL; 1290use SDL::OpenGL;
903 1291
904our @ISA = Crossfire::Client::Widget::Bin::; 1292our @ISA = CFClient::Widget::Bin::;
905 1293
906sub moveto { 1294sub moveto {
907 my ($self, $x, $y) = @_; 1295 my ($self, $x, $y) = @_;
908 1296
909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
910 $self->{speed} = 0.2; 1298 $self->{speed} = 0.001;
911 $self->{time} = 1; 1299 $self->{time} = 1;
912 1300
913 ::animation_start $self; 1301 ::animation_start $self;
914} 1302}
915 1303
… …
930 1318
931sub _draw { 1319sub _draw {
932 my ($self) = @_; 1320 my ($self) = @_;
933 1321
934 glPushMatrix; 1322 glPushMatrix;
935 glRotate $self->{time} * 10000, 0, 1, 0; 1323 glRotate $self->{time} * 1000, 0, 1, 0;
936 $self->{children}[0]->draw; 1324 $self->{children}[0]->draw;
937 glPopMatrix; 1325 glPopMatrix;
938} 1326}
939 1327
9401; 1328#############################################################################
941 1329
1330package CFClient::Widget::Toplevel;
1331
1332our @ISA = CFClient::Widget::Container::;
1333
1334sub size_request {
1335 ($::WIDTH, $::HEIGHT)
1336}
1337
1338sub size_allocate {
1339 my ($self, $w, $h) = @_;
1340
1341 $self->SUPER::size_allocate ($w, $h);
1342
1343 $_->size_allocate ($_->size_request)
1344 for @{$self->{children}};
1345}
1346
1347sub translate {
1348 my ($self, $x, $y) = @_;
1349
1350 ($x, $y)
1351}
1352
1353sub update {
1354 my ($self) = @_;
1355
1356 $self->size_allocate ($self->size_request);
1357 ::refresh ();
1358}
1359
1360sub add {
1361 my ($self, $widget) = @_;
1362
1363 $self->SUPER::add ($widget);
1364
1365 $widget->size_allocate ($widget->size_request);
1366}
1367
1368sub draw {
1369 my ($self) = @_;
1370
1371 $self->_draw;
1372}
1373
1374#############################################################################
1375
1376package CFClient::Widget;
1377
1378$TOPLEVEL = new CFClient::Widget::Toplevel;
1379
13801
1381

Diff Legend

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