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.87 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.137 by root, Wed Apr 19 21:38:05 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
21 $FOCUS->key_up ($_[0]) if $FOCUS; 21 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 22}
23 23
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->{x}, $ev->{y});
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->{x}, $ev->{y});
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
54 } 54 }
55} 55}
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->{x}, $ev->{y});
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
83 96
84 my $self = bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1,
89 h => -1,
90 @_ 101 @_
91 }, $class; 102 }, $class;
92 103
93 for (keys %$self) { 104 for (keys %$self) {
94 if (/^connect_(.*)$/) { 105 if (/^connect_(.*)$/) {
… …
97 } 108 }
98 109
99 $self 110 $self
100} 111}
101 112
113sub show {
114 my ($self) = @_;
115
116 return if $self->{parent};
117
118 $CFClient::UI::ROOT->add ($self);
119}
120
121sub hide {
122 my ($self) = @_;
123
124 return unless $self->{parent};
125
126 $self->{parent}->remove ($self);
127}
128
102sub move { 129sub move {
103 my ($self, $x, $y, $z) = @_; 130 my ($self, $x, $y, $z) = @_;
131
104 $self->{x} = $x; 132 $self->{x} = int $x;
105 $self->{y} = $y; 133 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 134 $self->{z} = $z if defined $z;
135
136 $self->update;
107} 137}
108 138
109sub needs_redraw { 139sub needs_redraw {
110 0 140 0
111} 141}
… …
113sub size_request { 143sub size_request {
114 require Carp; 144 require Carp;
115 Carp::confess "size_request is abtract"; 145 Carp::confess "size_request is abtract";
116} 146}
117 147
118sub _size_allocate { 148sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 149 my ($self, $x, $y, $w, $h) = @_;
120 150
121 $self->{x} = $x; 151 $self->{x} = $x;
122 $self->{y} = $y; 152 $self->{y} = $y;
123 153
124 return unless $self->{w} != $w || $self->{h} != $h; 154 return unless $self->{w} != $w || $self->{h} != $h;
125 155
126 $self->{w} = $w; 156 $self->{w} = $w;
127 $self->{h} = $h; 157 $self->{h} = $h;
128 158
129 1 159 $self->size_allocate ($w, $h);
160 $self->update;
130} 161}
131 162
132sub size_allocate { 163sub size_allocate {
164 # nothing to be done
165}
166
167# return top left coordinates
168sub _topleft {
133 my ($self, $x, $y, $w, $h) = @_; 169 my ($self, $x, $y) = @_;
134 170
135 $self->_size_allocate ($x, $y, $w, $h); 171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 172}
137 173
138# translate global coordinates to local coordinate system 174# translate global coordinates to local coordinate system
139sub translate { 175sub coord2local {
140 my ($self, $x, $y) = @_; 176 my ($self, $x, $y) = @_;
141 177
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 178 my ($X, $Y) = $self->_topleft;
179 ($x - $X, $y - $Y)
180}
181
182# translate local coordinates to global coordinate system
183sub coord2global {
184 my ($self, $x, $y) = @_;
185
186 my ($X, $Y) = $self->_topleft;
187 ($x + $X, $y + $Y)
143} 188}
144 189
145sub focus_in { 190sub focus_in {
146 my ($self) = @_; 191 my ($self) = @_;
147 192
148 return if $FOCUS == $self; 193 return if $FOCUS == $self;
194 return unless $self->{can_focus};
149 195
150 my $focus = $FOCUS; $FOCUS = $self; 196 my $focus = $FOCUS; $FOCUS = $self;
197
198 $self->emit (focus_in => $focus);
199
151 $focus->update if $focus; 200 $focus->update if $focus;
152 $FOCUS->update; 201 $FOCUS->update;
153} 202}
154 203
155sub focus_out { 204sub focus_out {
156 my ($self) = @_; 205 my ($self) = @_;
157 206
158 return unless $FOCUS == $self; 207 return unless $FOCUS == $self;
159 208
160 my $focus = $FOCUS; undef $FOCUS; 209 my $focus = $FOCUS; undef $FOCUS;
210
211 $self->emit (focus_out => $focus);
212
161 $focus->update if $focus; #? 213 $focus->update if $focus; #?
162} 214}
163 215
164sub mouse_motion { } 216sub mouse_motion { }
165sub button_up { } 217sub button_up { }
… …
186 glPushMatrix; 238 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 239 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 240 $self->_draw;
189 glPopMatrix; 241 glPopMatrix;
190 242
191 if ($self == $HOVER) { 243 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 244 my ($x, $y) = @$self{qw(x y)};
193 245
194 glColor 0, 0, 1, 0.2; 246 glColor 1, 0.8, 0.5, 0.2;
195 glEnable GL_BLEND; 247 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 248 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS; 249 glBegin GL_QUADS;
198 glVertex $x , $y; 250 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y; 251 glVertex $x + $self->{w}, $y;
… …
219 271
220 () 272 ()
221} 273}
222 274
223sub set_parent { 275sub set_parent {
224 my ($self, $par) = @_; 276 my ($self, $parent) = @_;
225 277
226 $self->{parent} = $par;
227 Scalar::Util::weaken $self->{parent}; 278 Scalar::Util::weaken ($self->{parent} = $parent);
228} 279}
229 280
230sub get_parent { 281sub check_size {
231 $_[0]->{parent} 282 my ($self) = @_;
283
284 my ($w, $h) = $self->size_request;
285
286 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w;
288 $self->{req_h} = $h;
289
290 $self->{parent}->check_size
291 if $self->{parent};
292 }
232} 293}
233 294
234sub update { 295sub update {
235 my ($self) = @_; 296 my ($self) = @_;
236 297
… …
239} 300}
240 301
241sub connect { 302sub connect {
242 my ($self, $signal, $cb) = @_; 303 my ($self, $signal, $cb) = @_;
243 304
244 push @{ $self->{cb}{$signal} }, $cb; 305 push @{ $self->{signal_cb}{$signal} }, $cb;
245} 306}
246 307
247sub emit { 308sub emit {
248 my ($self, $signal, @args) = @_; 309 my ($self, $signal, @args) = @_;
249 310
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
250 $_->($self, @args) 312 $cb->($self, @args);
251 for @{$self->{cb}{$signal} || []}; 313 }
252} 314}
253 315
254sub DESTROY { 316sub DESTROY {
255 my ($self) = @_; 317 my ($self) = @_;
256 318
… …
325 387
326 $self 388 $self
327} 389}
328 390
329sub add { 391sub add {
330 my ($self, $chld) = @_; 392 my ($self, $child) = @_;
331 393
332 $chld->set_parent ($self); 394 $child->set_parent ($self);
395
396 use sort 'stable';
333 397
334 $self->{children} = [ 398 $self->{children} = [
335 sort { $a->{z} <=> $b->{z} } 399 sort { $a->{z} <=> $b->{z} }
336 @{$self->{children}}, $chld 400 @{$self->{children}}, $child
337 ]; 401 ];
338 402
339 $self->{w} = $self->{h} = -1; 403 $child->check_size;
340 $self->update;
341} 404}
342 405
343sub remove { 406sub remove {
344 my ($self, $widget) = @_; 407 my ($self, $child) = @_;
345 408
409 delete $child->{parent};
410
346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
347 412
348 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 413 $self->check_size;
349} 414}
350 415
351sub find_widget { 416sub find_widget {
352 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
353 418
… …
383 448
384 $class->SUPER::new (children => [$child], %arg) 449 $class->SUPER::new (children => [$child], %arg)
385} 450}
386 451
387sub add { 452sub add {
388 my ($self, $widget) = @_; 453 my ($self, $child) = @_;
389 454
390 $self->{children} = []; 455 $self->{children} = [];
391 456
392 $self->SUPER::add ($widget); 457 $self->SUPER::add ($child);
393} 458}
394 459
395sub remove { 460sub remove {
396 my ($self, $widget) = @_; 461 my ($self, $widget) = @_;
397 462
… …
406sub size_request { 471sub size_request {
407 $_[0]{children}[0]->size_request 472 $_[0]{children}[0]->size_request
408} 473}
409 474
410sub size_allocate { 475sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_; 476 my ($self, $w, $h) = @_;
412 477
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h); 478 $self->{children}[0]->configure (0, 0, $w, $h);
416} 479}
417 480
418############################################################################# 481#############################################################################
419 482
420package CFClient::UI::Window; 483package CFClient::UI::Window;
… …
438} 501}
439 502
440sub render_chld { 503sub render_chld {
441 my ($self) = @_; 504 my ($self) = @_;
442 505
443 $self->{texture} = 506 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444 CFClient::Texture->new_from_opengl ( 507 glClearColor 0, 0, 0, 1;
445 $self->{w}, $self->{h}, sub { $self->child->draw } 508 glClear GL_COLOR_BUFFER_BIT;
446 ); 509 $self->child->draw;
510 };
447} 511}
448 512
449sub size_allocate { 513sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 514 my ($self, $w, $h) = @_;
451 515
452 $self->_size_allocate ($x, $y, $w, $h) or return;
453
454 $self->child->size_allocate (0, 0, $w, $h); 516 $self->child->configure (0, 0, $w, $h);
455 517
456 $self->render_chld; 518 $self->render_chld;
457} 519}
458 520
459sub _draw { 521sub _draw {
… …
475 glDisable GL_TEXTURE_2D; 537 glDisable GL_TEXTURE_2D;
476} 538}
477 539
478############################################################################# 540#############################################################################
479 541
542package CFClient::UI::ViewPort;
543
544our @ISA = CFClient::UI::Window::;
545
546sub new { die }
547
548sub size_request {
549 my ($self) = @_;
550
551 @$self{qw(child_w child_h)} = $self->child->size_request;
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553
554 @$self{qw(child_w child_h)}
555}
556
557sub _draw {
558 my ($self) = @_;
559
560 $self->{children}[1]->draw;
561}
562
563
564#############################################################################
565
480package CFClient::UI::Frame; 566package CFClient::UI::Frame;
481 567
482our @ISA = CFClient::UI::Bin::; 568our @ISA = CFClient::UI::Bin::;
483 569
484use SDL::OpenGL; 570use SDL::OpenGL;
… …
494} 580}
495 581
496sub size_allocate { 582sub size_allocate {
497 my ($self, $x, $y, $w, $h) = @_; 583 my ($self, $x, $y, $w, $h) = @_;
498 584
499 $self->_size_allocate ($x, $y, $w, $h) or return;
500
501 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 585 $self->child->configure (2, 2, $w - 4, $h - 4);
502} 586}
503 587
504sub _draw { 588sub _draw {
505 my ($self) = @_; 589 my ($self) = @_;
506 590
… …
529 613
530my @tex = 614my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 616 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533 617
618sub new {
619 my $class = shift;
620
621 # TODO: user_x, user_y, overwrite moveto?
622
623 $class->SUPER::new (
624 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1],
626 border => 0.8,
627 @_
628 )
629}
630
631sub border {
632 int $_[0]{border} * $::FONTSIZE
633}
634
534sub size_request { 635sub size_request {
535 my ($self) = @_; 636 my ($self) = @_;
536 637
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538 639
539 my ($w, $h) = $self->SUPER::size_request; 640 my ($w, $h) = $self->SUPER::size_request;
540 641
541 $h += $tex[1]->{h}; 642 (
542 $h += $tex[4]->{h}; 643 $w + $self->border * 2,
543 $w += $tex[2]->{w}; 644 $h + $self->border * 2,
544 $w += $tex[3]->{w}; 645 )
545
546 ($w, $h)
547} 646}
548 647
549sub size_allocate { 648sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_; 649 my ($self, $w, $h) = @_;
551 650
552 $self->_size_allocate ($x, $y, $w, $h) or return; 651 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2;
553 653
554 $h -= $tex[1]{h}; 654 $self->child->configure ($self->border, $self->border, $w, $h);
555 $h -= $tex[4]{h};
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558
559 $h = $h < 0 ? 0 : $h;
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565} 655}
566 656
567sub button_down { 657sub button_down {
568 my ($self, $ev, $x, $y) = @_; 658 my ($self, $ev, $x, $y) = @_;
569 659
660 my $border = $self->border;
661
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 662 if ($x < $self->{w} && $x >= $self->{w} - $border
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 663 && $y < $self->{h} && $y >= $self->{h} - $border) {
572 664
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 665 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 666 my ($bw, $bh) = ($self->{w}, $self->{h});
575 667
576 $self->{motion} = sub { 668 $self->{motion} = sub {
… …
578 670
579 ($x, $y) = ($ev->motion_x, $ev->motion_y); 671 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580 672
581 $self->{user_w} = $bw + $x - $ox; 673 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy; 674 $self->{user_h} = $bh + $y - $oy;
583 $self->update; 675 $self->check_size;
584 }; 676 };
585 677
586 } elsif ($x >= 0 && $x < $self->{w} 678 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) { 679 && $y >= 0 && $y < $border) {
588 680
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 681 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y}); 682 my ($bx, $by) = ($self->{x}, $self->{y});
591 683
592 $self->{motion} = sub { 684 $self->{motion} = sub {
… …
613} 705}
614 706
615sub _draw { 707sub _draw {
616 my ($self) = @_; 708 my ($self) = @_;
617 709
618 my ($w, $h) = ($self->{w}, $self->{h}); 710 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 711 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 712
621 glEnable GL_BLEND; 713 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 715 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 717
626 my $top = $tex[1]; 718 my $border = $self->border;
719
720 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 721 $tex[1]->draw_quad (0, 0, $w, $border);
628 722 $tex[3]->draw_quad (0, $border, $border, $ch);
629 my $left = $tex[3]; 723 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 724 $tex[4]->draw_quad (0, $h - $border, $w, $border);
631
632 my $right = $tex[2];
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637 725
638 my $bg = $tex[0]; 726 my $bg = $tex[0];
639 727
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 728 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643 my $rep_x = $cw / $bg->{w}; 729 my $rep_x = $cw / $bg->{w};
644 my $rep_y = $ch / $bg->{h}; 730 my $rep_y = $ch / $bg->{h};
645 731
646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 732 glColor @{ $self->{bg} };
733
734 $bg->{s} = $rep_x;
735 $bg->{t} = $rep_y;
736 $bg->{wrap_mode} = 1;
737 $bg->draw_quad ($border, $border, $cw, $ch);
647 738
648 glDisable GL_TEXTURE_2D; 739 glDisable GL_TEXTURE_2D;
649 glDisable GL_BLEND; 740 glDisable GL_BLEND;
650 741
651 $self->child->draw; 742 $self->child->draw;
652
653} 743}
654 744
655############################################################################# 745#############################################################################
656 746
657package CFClient::UI::Table; 747package CFClient::UI::Table;
… …
670 @_ 760 @_
671 ) 761 )
672} 762}
673 763
674sub add { 764sub add {
675 my ($self, $x, $y, $chld) = @_; 765 my ($self, $x, $y, $child) = @_;
676 766
767 $child->set_parent ($self);
677 $self->{children}[$y][$x] = $chld; 768 $self->{children}[$y][$x] = $child;
678 $chld->set_parent ($self);
679 769
680 $self->{w} = $self->{h} = -1; 770 $child->check_size;
771}
772
773# TODO: move to container class maybe? send childs a signal on removal?
774sub clear {
775 my ($self) = @_;
776
777 delete $self->{children};
681 $self->update; 778 $self->update;
682} 779}
683 780
684sub get_wh { 781sub get_wh {
685 my ($self) = @_; 782 my ($self) = @_;
… …
713 (sum @$hs), 810 (sum @$hs),
714 ) 811 )
715} 812}
716 813
717sub size_allocate { 814sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_; 815 my ($self, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721 816
722 my ($ws, $hs) = $self->get_wh; 817 my ($ws, $hs) = $self->get_wh;
723 818
724 my $req_w = sum @$ws; 819 my $req_w = sum @$ws;
725 my $req_h = sum @$hs; 820 my $req_h = sum @$hs;
… …
730 my $col_expand = (sum @col_expand) || 1; 825 my $col_expand = (sum @col_expand) || 1;
731 826
732 # linearly scale sizes 827 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 828 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 829 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
830
831 CFClient::UI::harmonize $ws;
832 CFClient::UI::harmonize $hs;
735 833
736 my $y; 834 my $y;
737 835
738 for my $r (0 .. $#{$self->{children}}) { 836 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r] 837 my $row = $self->{children}[$r]
… …
744 842
745 for my $c (0 .. $#$row) { 843 for my $c (0 .. $#$row) {
746 my $col_w = $ws->[$c]; 844 my $col_w = $ws->[$c];
747 845
748 if (my $widget = $row->[$c]) { 846 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h); 847 $widget->configure ($x, $y, $col_w, $row_h);
750 } 848 }
751 849
752 $x += $col_w; 850 $x += $col_w;
753 } 851 }
754 852
… …
799 (List::Util::max map $_->[1], @alloc), 897 (List::Util::max map $_->[1], @alloc),
800 ) 898 )
801} 899}
802 900
803sub size_allocate { 901sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h);
807 903
808 ($h, $w) = ($w, $h); 904 ($h, $w) = ($w, $h);
809 905
810 my $children = $self->{children}; 906 my $children = $self->{children};
811 907
… …
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 923 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h; 924 $h[$_] = $alloc_h;
829 } 925 }
830 } 926 }
831 927
928 CFClient::UI::harmonize \@h;
929
832 my $y = 0; 930 my $y = 0;
833 for (0 .. $#$children) { 931 for (0 .. $#$children) {
834 my $child = $children->[$_]; 932 my $child = $children->[$_];
835 my $h = $h[$_]; 933 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w); 934 $child->configure ($y, 0, $h, $w);
837 935
838 $y += $h; 936 $y += $h;
839 } 937 }
938
939 1
840} 940}
841 941
842############################################################################# 942#############################################################################
843 943
844package CFClient::UI::VBox; 944package CFClient::UI::VBox;
… …
857 (List::Util::sum map $_->[1], @alloc), 957 (List::Util::sum map $_->[1], @alloc),
858 ) 958 )
859} 959}
860 960
861sub size_allocate { 961sub size_allocate {
862 my ($self, $x, $y, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
863
864 $self->_size_allocate ($x, $y, $w, $h);
865 963
866 my $children = $self->{children}; 964 my $children = $self->{children};
867 965
868 my @h = map +($_->size_request)[1], @$children; 966 my @h = map +($_->size_request)[1], @$children;
869 967
… …
881 979
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 980 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883 } 981 }
884 } 982 }
885 983
984 CFClient::UI::harmonize \@h;
985
886 my $y = 0; 986 my $y = 0;
887 for (0 .. $#$children) { 987 for (0 .. $#$children) {
888 my $child = $children->[$_]; 988 my $child = $children->[$_];
889 my $h = $h[$_]; 989 my $h = $h[$_];
890 $child->size_allocate (0, $y, $w, $h); 990 $child->configure (0, $y, $w, $h);
891 991
892 $y += $h; 992 $y += $h;
893 } 993 }
994
995 1
894} 996}
895 997
896############################################################################# 998#############################################################################
897 999
898package CFClient::UI::Label; 1000package CFClient::UI::Label;
… …
903 1005
904sub new { 1006sub new {
905 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
906 1008
907 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
908 fg => [1, 1, 1], 1010 fg => [1, 1, 1],
909 height => $::FONTSIZE, 1011 fontsize => 1,
910 text => "", 1012 text => "",
911 align => -1, 1013 align => -1,
1014 valign => -1,
912 padding => 2, 1015 padding => 2,
913 layout => new CFClient::Layout, 1016 layout => new CFClient::Layout,
914 %arg 1017 %arg
915 ); 1018 );
916 1019
917 $self->set_text ($self->{text}); 1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1021
1022 $self->set_text (delete $self->{text}) if exists $self->{text};
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
918 1024
919 $self 1025 $self
920} 1026}
921 1027
922sub escape_text { 1028sub escape_text {
… …
930} 1036}
931 1037
932sub set_text { 1038sub set_text {
933 my ($self, $text) = @_; 1039 my ($self, $text) = @_;
934 1040
935 $self->{text} = $text;
936 $self->{layout}->set_markup ($text); 1041 $self->{layout}->set_text ($text);
937 1042
938 delete $self->{texture}; 1043 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
940 $self->update; 1044 $self->update;
941} 1045}
942 1046
943sub get_text { 1047sub set_markup {
944 my ($self, $text) = @_; 1048 my ($self, $markup) = @_;
945 1049
946 $self->{text} 1050 $self->{layout}->set_markup ($markup);
1051
1052 delete $self->{texture};
1053 $self->update;
947} 1054}
948 1055
949sub size_request { 1056sub size_request {
950 my ($self) = @_; 1057 my ($self) = @_;
951 1058
952 $self->{layout}->set_width; 1059 $self->{layout}->set_width;
953 $self->{layout}->set_height ($self->{height}); 1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061
954 my ($w, $h) = $self->{layout}->size; 1062 my ($w, $h) = $self->{layout}->size;
955 1063
956 ( 1064 (
957 $w + $self->{padding} * 2, 1065 $w + $self->{padding} * 2,
958 $h + $self->{padding} * 2, 1066 $h + $self->{padding} * 2,
959 ) 1067 )
960} 1068}
961 1069
962sub size_allocate { 1070sub size_allocate {
963 my ($self, $x, $y, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
964
965 $self->_size_allocate ($x, $y, $w, $h) or return;
966 1072
967 delete $self->{texture}; 1073 delete $self->{texture};
968}
969
970sub update {
971 my ($self) = @_;
972
973 delete $self->{texture};
974 $self->SUPER::update;
975} 1074}
976 1075
977sub _draw { 1076sub _draw {
978 my ($self) = @_; 1077 my ($self) = @_;
979 1078
980 my $tex = $self->{texture} ||= do { 1079 my $tex = $self->{texture} ||= do {
981 $self->{layout}->set_width ($self->{w}); 1080 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
983 new_from_layout CFClient::Texture $self->{layout} 1082 new_from_layout CFClient::Texture $self->{layout}
984 }; 1083 };
985 1084
986 glEnable GL_BLEND; 1085 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D; 1087 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990 1089
991 glColor @{$self->{fg}}; 1090 glColor @{$self->{fg}};
992 1091
993 my $x = 1092 $self->{ox} = int (
994 $self->{align} < 0 ? $self->{padding} 1093 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1094 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5; 1095 : ($self->{w} - $tex->{w}) * 0.5
1096 );
997 1097
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0; 1098 $self->{oy} = int (
999 $tex->draw_quad (0, 0); 1099 $self->{valign} < 0 ? $self->{padding}
1100 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1101 : ($self->{h} - $tex->{h}) * 0.5
1102 );
1103
1104 $tex->draw_quad ($self->{ox}, $self->{oy});
1000 1105
1001 glDisable GL_TEXTURE_2D; 1106 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND; 1107 glDisable GL_BLEND;
1003} 1108}
1004 1109
1005############################################################################# 1110#############################################################################
1006 1111
1007package CFClient::UI::Entry; 1112package CFClient::UI::EntryBase;
1008 1113
1009our @ISA = CFClient::UI::Label::; 1114our @ISA = CFClient::UI::Label::;
1010 1115
1011use SDL;
1012use SDL::OpenGL; 1116use SDL::OpenGL;
1013 1117
1014sub new { 1118sub new {
1015 my $class = shift; 1119 my $class = shift;
1016 1120
1017 $class->SUPER::new ( 1121 $class->SUPER::new (
1018 fg => [1, 1, 1], 1122 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2], 1123 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5], 1124 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0], 1125 active_fg => [0, 0, 0],
1126 can_hover => 1,
1127 can_focus => 1,
1128 valign => 0,
1022 @_ 1129 @_
1023 ) 1130 )
1024} 1131}
1025 1132
1026sub _set_text { 1133sub _set_text {
1027 my ($self, $text) = @_; 1134 my ($self, $text) = @_;
1028 1135
1136 delete $self->{cur_h};
1137
1138 return if $self->{text} eq $text;
1139
1140 delete $self->{texture};
1141
1029 $self->{last_activity} = $::NOW; 1142 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text; 1143 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034 1144
1035 $text =~ s/./*/g if $self->{hidden}; 1145 $text =~ s/./*/g if $self->{hidden};
1146 $self->{layout}->set_text ("$text ");
1036 1147
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1148 $self->emit (changed => $self->{text});
1149}
1038 1150
1039 $text = substr $text, 0, $self->{cursor}; 1151sub get_text {
1040 utf8::encode $text; 1152 $_[0]{text}
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043} 1153}
1044 1154
1045sub size_request { 1155sub size_request {
1046 my ($self) = @_; 1156 my ($self) = @_;
1047 1157
… …
1049 1159
1050 ($w + 1, $h) # add 1 for cursor 1160 ($w + 1, $h) # add 1 for cursor
1051} 1161}
1052 1162
1053sub size_allocate { 1163sub size_allocate {
1054 my ($self, $x, $y, $w, $h) = @_; 1164 my ($self, $w, $h) = @_;
1055
1056 $self->SUPER::size_allocate ($x, $y, $w, $h);
1057 1165
1058 $self->_set_text ($self->{text}); 1166 $self->_set_text ($self->{text});
1059} 1167}
1060 1168
1061sub set_text { 1169sub set_text {
… …
1067} 1175}
1068 1176
1069sub key_down { 1177sub key_down {
1070 my ($self, $ev) = @_; 1178 my ($self, $ev) = @_;
1071 1179
1072 my $mod = $ev->key_mod; 1180 my $mod = $ev->{mod};
1073 my $sym = $ev->key_sym; 1181 my $sym = $ev->{sym};
1074
1075 my $uni = $ev->key_unicode; 1182 my $uni = $ev->{unicode};
1076 1183
1077 my $text = $self->get_text; 1184 my $text = $self->get_text;
1078 1185
1079 if ($sym == SDLK_BACKSPACE) { 1186 if ($sym == 8) {
1080 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1187 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1081 } elsif ($sym == SDLK_DELETE) { 1188 } elsif ($sym == 127) {
1082 substr $text, $self->{cursor}, 1, ""; 1189 substr $text, $self->{cursor}, 1, "";
1083 } elsif ($sym == SDLK_LEFT) { 1190 } elsif ($sym == CFClient::SDLK_LEFT) {
1084 --$self->{cursor} if $self->{cursor}; 1191 --$self->{cursor} if $self->{cursor};
1085 } elsif ($sym == SDLK_RIGHT) { 1192 } elsif ($sym == CFClient::SDLK_RIGHT) {
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1193 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) { 1194 } elsif ($sym == CFClient::SDLK_HOME) {
1088 $self->{cursor} = 0; 1195 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) { 1196 } elsif ($sym == CFClient::SDLK_END) {
1090 $self->{cursor} = length $text; 1197 $self->{cursor} = length $text;
1198 } elsif ($sym == 27) {
1199 $self->emit ('escape');
1091 } elsif ($uni) { 1200 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni; 1201 substr $text, $self->{cursor}++, 0, chr $uni;
1093 } 1202 }
1094 1203
1095 $self->_set_text ($text); 1204 $self->_set_text ($text);
… …
1149 1258
1150 $self->SUPER::_draw; 1259 $self->SUPER::_draw;
1151 1260
1152 #TODO: force update every cursor change :( 1261 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1262 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1263
1264 unless (exists $self->{cur_h}) {
1265 my $text = substr $self->{text}, 0, $self->{cursor};
1266 utf8::encode $text;
1267
1268 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1269 }
1270
1154 glColor @{$self->{fg}}; 1271 glColor @{$self->{fg}};
1155 glBegin GL_LINES; 1272 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1273 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1274 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1158 glEnd; 1275 glEnd;
1159 } 1276 }
1160} 1277}
1161 1278
1279package CFClient::UI::Entry;
1280
1281our @ISA = CFClient::UI::EntryBase::;
1282
1283use SDL::OpenGL;
1284
1285sub key_down {
1286 my ($self, $ev) = @_;
1287
1288 my $sym = $ev->{sym};
1289
1290 if ($sym == 13) {
1291 $self->emit (activate => $self->get_text);
1292 $self->update;
1293
1294 } else {
1295 $self->SUPER::key_down ($ev);
1296 }
1297
1298}
1299
1162############################################################################# 1300#############################################################################
1163 1301
1164package CFClient::UI::Button; 1302package CFClient::UI::Button;
1165 1303
1166our @ISA = CFClient::UI::Label::; 1304our @ISA = CFClient::UI::Label::;
1167 1305
1168use SDL;
1169use SDL::OpenGL; 1306use SDL::OpenGL;
1170 1307
1171my @tex = 1308my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png); 1310 qw(b1_button_active.png);
… …
1177 1314
1178 $class->SUPER::new ( 1315 $class->SUPER::new (
1179 padding => 4, 1316 padding => 4,
1180 fg => [1, 1, 1], 1317 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1318 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5], 1319 active_fg => [0, 0, 1],
1184# border_fg => [1, 1, 0], 1320 can_hover => 1,
1321 align => 0,
1322 valign => 0,
1185 @_ 1323 @_
1186 ) 1324 )
1187} 1325}
1188 1326
1189sub button_up { 1327sub button_up {
… …
1197 1335
1198sub _draw { 1336sub _draw {
1199 my ($self) = @_; 1337 my ($self) = @_;
1200 1338
1201 local $self->{fg} = $self->{fg}; 1339 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1203
1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207 1340
1208 if ($GRAB == $self) { 1341 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg}; 1342 $self->{fg} = $self->{active_fg};
1210 } 1343 }
1211 1344
1212 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1345 glEnable GL_BLEND;
1346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1347 glEnable GL_TEXTURE_2D;
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1349 glColor 0, 0, 0, 1;
1214 1350
1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1351 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1216 1352
1217 glDisable GL_TEXTURE_2D; 1353 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND; 1354 glDisable GL_BLEND;
1219 1355
1220 $self->SUPER::_draw; 1356 $self->SUPER::_draw;
… …
1224 1360
1225package CFClient::UI::CheckBox; 1361package CFClient::UI::CheckBox;
1226 1362
1227our @ISA = CFClient::UI::DrawBG::; 1363our @ISA = CFClient::UI::DrawBG::;
1228 1364
1229use SDL; 1365my @tex =
1366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1367 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1368
1230use SDL::OpenGL; 1369use SDL::OpenGL;
1231 1370
1232sub new { 1371sub new {
1233 my $class = shift; 1372 my $class = shift;
1234 1373
1235 $class->SUPER::new ( 1374 $class->SUPER::new (
1236 padding => 2, 1375 padding => 2,
1237 fg => [1, 1, 1], 1376 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0], 1377 active_fg => [1, 1, 0],
1239 state => 0, 1378 state => 0,
1379 can_hover => 1,
1240 @_ 1380 @_
1241 ) 1381 )
1242} 1382}
1243 1383
1244sub size_request { 1384sub size_request {
1245 my ($self) = @_; 1385 my ($self) = @_;
1246 1386
1247 ($self->{padding} * 2 + 6) x 2 1387 ($self->{padding} * 2 + 6) x 2
1248}
1249
1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
1252
1253 $self->_size_allocate ($x, $y, $w, $h);
1254} 1388}
1255 1389
1256sub button_down { 1390sub button_down {
1257 my ($self, $ev, $x, $y) = @_; 1391 my ($self, $ev, $x, $y) = @_;
1258 1392
… …
1269 $self->SUPER::_draw; 1403 $self->SUPER::_draw;
1270 1404
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1405 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272 1406
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1407 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274 1408
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1409 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276 1410
1277 glBegin GL_LINE_LOOP; 1411 glEnable GL_BLEND;
1278 glVertex 0 , 0; 1412 glEnable GL_TEXTURE_2D;
1279 glVertex 0 , $s; 1413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283 1414
1284 if ($self->{state}) { 1415 my $tex = $self->{state} ? $tex[1] : $tex[0];
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292}
1293 1416
1294############################################################################# 1417 $tex->draw_quad (0, 0, $s, $s);
1295 1418
1419 glDisable GL_TEXTURE_2D;
1420 glDisable GL_BLEND;
1421}
1422
1423#############################################################################
1424
1296package CFClient::UI::Slider; 1425package CFClient::UI::VGauge;
1297 1426
1298use strict; 1427our @ISA = CFClient::UI::Base::;
1299 1428
1300use SDL::OpenGL; 1429use SDL::OpenGL;
1301 1430
1302our @ISA = CFClient::UI::DrawBG::; 1431my %tex = (
1432 food => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1435 ],
1436 grace => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1439 ],
1440 hp => [
1441 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1442 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1443 ],
1444 mana => [
1445 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1446 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1447 ],
1448);
1303 1449
1450# eg. VGauge->new (gauge => 'food'), default gauge: food
1304sub new { 1451sub new {
1305 my $class = shift; 1452 my $class = shift;
1306 1453
1454 my $self = $class->SUPER::new (gauge => 'food', @_);
1455
1456 $self
1457}
1458
1459sub size_request {
1460 my ($self) = @_;
1461
1462 my $tex = $tex{$self->{gauge}}[0];
1463
1464 @$tex{qw(w h)}
1465}
1466
1467sub set_max {
1468 my ($self, $max) = @_;
1469
1470 $self->{max_val} = $max;
1471}
1472
1473sub set_value {
1474 my ($self, $val, $max) = @_;
1475
1476 $self->set_max ($max)
1477 if defined $max;
1478
1479 $max = $self->{max_val};
1480 $self->{val} = $val;
1481
1482 $self->update;
1483}
1484
1485sub _draw {
1486 my ($self) = @_;
1487
1488 my $tex = $tex{$self->{gauge}};
1489
1490 my ($w, $h) = ($self->{w}, $self->{h});
1491
1492 my $ycut = $self->{val} / ($self->{max_val} || 1);
1493 $ycut = 1 if $self->{val} > $self->{max_val};
1494
1495 my $t1 = $tex->[0];
1496 my $t2 = $tex->[1];
1497
1498 glEnable GL_BLEND;
1499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1500 glEnable GL_TEXTURE_2D;
1501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1502
1503 my $h1 = $self->{h} - $ycut * $self->{h};
1504 my $h2 = $ycut * $self->{h};
1505
1506 my $yp = 0;
1507
1508 glBindTexture GL_TEXTURE_2D, $t1->{name};
1509 glBegin GL_QUADS;
1510 glTexCoord 0 , 0; glVertex 0 , $yp;
1511 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1512 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1513 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1514 glEnd;
1515
1516 $yp += $h1;
1517
1518 glBindTexture GL_TEXTURE_2D, $t2->{name};
1519 glBegin GL_QUADS;
1520 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1521 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1522 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1523 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1524 glEnd;
1525
1526 glDisable GL_BLEND;
1527 glDisable GL_TEXTURE_2D;
1528}
1529
1530#############################################################################
1531
1532package CFClient::UI::Slider;
1533
1534use strict;
1535
1536use SDL::OpenGL;
1537
1538our @ISA = CFClient::UI::DrawBG::;
1539
1540my @tex =
1541 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1542 qw(s1_slider.png s1_slider_bg.png);
1543
1544sub new {
1545 my $class = shift;
1546
1307 # range [value, low, high, page] 1547 # range [value, low, high, page]
1308 1548
1549 # TODO: 0-width page
1550 # TODO: req_w/h are wrong with vertical
1551 # TODO: calculations are off
1309 my $self = $class->SUPER::new ( 1552 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1], 1553 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0], 1554 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10], 1555 range => [0, 0, 100, 10],
1313 req_w => 40, 1556 req_w => 20,
1314 req_h => 10, 1557 req_h => 20,
1315 vertical => 0, 1558 vertical => 0,
1559 can_hover => 1,
1560 inner_pad => 5,
1316 @_ 1561 @_
1317 ); 1562 );
1318 1563
1319 $self 1564 $self
1320} 1565}
… …
1341 if ($GRAB == $self) { 1586 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1587 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343 1588
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1589 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345 1590
1591 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1592 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1593
1594 $x -= $inner_pad_px; # substract the padding
1346 $x = $x * ($hi - $lo) / $w + $lo; 1595 $x = $x * ($hi - $lo) / $inner_w + $lo;
1347 $x = $lo if $x < $lo; 1596 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page; 1597 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x; 1598 $self->{range}[0] = $x;
1350 1599
1351 $self->emit (changed => $x); 1600 $self->emit (changed => $x);
1352 $self->update; 1601 $self->update;
1353 } 1602 }
1603}
1604
1605# the inner_* stuff is for generating a padding for the slider handle,
1606# so that the handle doesn't leave the texture. This calculation isn't 100%
1607# correct propably, but it does the job for now
1608sub _calc_inner_pad_px {
1609 my ($self, $w) = @_;
1610 ($w / 100) * $self->{inner_pad} # % to pixels
1354} 1611}
1355 1612
1356sub _draw { 1613sub _draw {
1357 my ($self) = @_; 1614 my ($self) = @_;
1358 1615
… …
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1629 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1630 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374 1631
1375 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1632 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376 1633
1634 $hi = $value + 1 if $lo == $hi;
1635
1636 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1637 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1638
1377 $page = int $page * $w / ($hi - $lo); 1639 $page = int $page * $inner_w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo); 1640 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379 1641
1380 $w -= $page; 1642 $w -= $page;
1381 $page &= ~1; 1643 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0; 1644 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2; 1645 $page ||= 2;
1384 1646
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5; 1647 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393 my $knob_b = $value + $page * 0.5; 1648 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394 1649
1395 glBegin GL_QUADS; 1650 glEnable GL_BLEND;
1396 glColor @$fg; 1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397 glVertex $knob_a, 0; 1652 glEnable GL_TEXTURE_2D;
1398 glVertex $knob_a, $h; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401 1654
1402 if ($knob_a < $knob_b - 2) { 1655 # draw background
1403 glColor @$bg; 1656 $tex[1]->draw_quad (0, 0, $w, $h);
1404 glVertex $knob_a + 1, 1;
1405 glVertex $knob_a + 1, $h - 1;
1406 glVertex $knob_b - 1, $h - 1;
1407 glVertex $knob_b - 1, 1;
1408 }
1409 glEnd;
1410}
1411 1657
1412############################################################################# 1658 # draw handle
1659 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1413 1660
1661 glDisable GL_BLEND;
1662 glDisable GL_TEXTURE_2D;
1663}
1664
1665#############################################################################
1666
1414package CFClient::UI::MapWidget; 1667package CFClient::UI::TextView;
1415 1668
1416use strict; 1669our @ISA = CFClient::UI::HBox::;
1417 1670
1418use List::Util qw(min max);
1419
1420use SDL;
1421use SDL::OpenGL; 1671use SDL::OpenGL;
1422
1423our @ISA = CFClient::UI::Base::;
1424 1672
1425sub new { 1673sub new {
1426 my $class = shift; 1674 my $class = shift;
1427 1675
1428 $class->SUPER::new ( 1676 my $self = $class->SUPER::new (
1429 z => -1, 1677 fontsize => 1,
1430 list => (glGenLists 1),
1431 @_ 1678 @_,
1679
1680 layout => (new CFClient::Layout),
1681 par => [],
1682 height => 0,
1683 children => [
1684 (new CFClient::UI::Empty expand => 1),
1685 (new CFClient::UI::Slider vertical => 1),
1686 ],
1432 ) 1687 );
1433}
1434 1688
1435sub key_down { 1689 $self->{children}[1]->connect (changed => sub {
1436 print "MAPKEYDOWN\n"; 1690 $self->update;
1437} 1691 });
1438 1692
1439sub key_up { 1693 $self
1440} 1694}
1441 1695
1442sub size_request { 1696sub set_fontsize {
1697 my ($self, $fontsize) = @_;
1698
1699 $self->{fontsize} = $fontsize;
1700 $self->reflow;
1701}
1702
1703sub text_height {
1704 my ($self, $text) = @_;
1705
1706 my $layout = $self->{layout};
1707
1708 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1709 $layout->set_width ($self->{w});
1710 $layout->set_text ($text);
1443 ( 1711
1444 1 + 32 * int $::WIDTH / 32, 1712 ($layout->size)[1]
1445 1 + 32 * int $::HEIGHT / 32, 1713}
1446 ) 1714
1715sub reflow {
1716 my ($self) = @_;
1717
1718 $self->{need_reflow}++;
1719 $self->update;
1720}
1721
1722sub size_allocate {
1723 my ($self, $w, $h) = @_;
1724
1725 $self->SUPER::size_allocate ($w, $h);
1726
1727 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1728 $self->{layout}->set_width ($self->{children}[0]{w});
1729
1730 $self->reflow;
1731}
1732
1733sub add_paragraph {
1734 my ($self, $color, $text) = @_;
1735
1736 #TODO: intelligently "reformat" paragraph
1737
1738 my $height = $self->text_height ($text);
1739
1740 $self->{height} += $height;
1741
1742 push @{$self->{par}}, [$height, $color, $text];
1743
1744 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1745 $self->{children}[1]->update;
1447} 1746}
1448 1747
1449sub update { 1748sub update {
1450 my ($self) = @_; 1749 my ($self) = @_;
1451 1750
1452 $self->{need_update} = 1;
1453 $self->SUPER::update; 1751 $self->SUPER::update;
1454}
1455 1752
1456sub draw { 1753 return unless $self->{h} > 0;
1457 my ($self) = @_;
1458 1754
1755 delete $self->{texture};
1756
1757 $ROOT->on_refresh ($self, sub {
1459 if (delete $self->{need_update}) { 1758 if (delete $self->{need_reflow}) {
1460 glNewList $self->{list}, GL_COMPILE; 1759 my $height = 0;
1461 1760
1462 my $mx = $::CONN->{mapx}; 1761 $height += $_->[0] = $self->text_height ($_->[2])
1463 my $my = $::CONN->{mapy}; 1762 for @{$self->{par}};
1464 1763
1465 my $map = $::CONN->{map}; 1764 $self->{height} = $height;
1466 1765
1467 my ($xofs, $yofs); 1766 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1468 1767
1469 my $sw = 1 + int $::WIDTH / 32; 1768 delete $self->{texture};
1470 my $sh = 1 + int $::HEIGHT / 32;
1471
1472 if ($::CONN->{mapw} > $sw) {
1473 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1474 } else {
1475 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1476 } 1769 }
1477 1770
1478 if ($::CONN->{maph} > $sh) { 1771 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1479 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1772 glClearColor 0, 0, 0, 1;
1480 } else { 1773 glClear GL_COLOR_BUFFER_BIT;
1481 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1774
1775 glEnable GL_BLEND;
1776 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1777 glEnable GL_TEXTURE_2D;
1778 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1779
1780 my $top = int $self->{children}[1]{range}[0];
1781
1782 my $y0 = $top;
1783 my $y1 = $top + $self->{h};
1784
1785 my $y = 0;
1786
1787 my $layout = $self->{layout};
1788
1789 for my $par (@{$self->{par}}) {
1790 my $h = $par->[0];
1791
1792 if ($y0 < $y + $h && $y < $y1) {
1793 $layout->set_text ($par->[2]);
1794
1795 glColor @{ $par->[1] };
1796 my ($W, $H) = $layout->size;
1797 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1798 }
1799
1800 $y += $h;
1801 }
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1482 } 1805 };
1806 });
1807}
1483 1808
1809sub _draw {
1810 my ($self) = @_;
1811
1812 if ($self->{texture}) {
1484 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1485 glEnable GL_BLEND;
1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 1815 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1489 my $sw4 = ($sw + 3) & ~3;
1490 my $darkness = "\x00" x ($sw4 * $sh);
1491
1492 for my $x (0 .. $sw - 1) {
1493 my $row = $map->[$x + $xofs];
1494 for my $y (0 .. $sh - 1) {
1495
1496 my $cell = $row->[$y + $yofs]
1497 or next;
1498
1499 my $dark = $cell->[0];
1500 if ($dark < 0) {
1501 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1502 } else {
1503 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1504 }
1505
1506 for my $num (grep $_, @$cell[1,2,3]) {
1507 my $tex = $::CONN->{face}[$num]{texture} || next;
1508
1509 my ($w, $h) = @$tex{qw(w h)};
1510
1511 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1512 }
1513 }
1514 }
1515
1516# if (1) { # higher quality darkness
1517# $lighting =~ s/(.)/$1$1$1/gs;
1518# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1519#
1520# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1521#
1522# $lighting = $pb->get_pixels;
1523# $lighting =~ s/(.)../$1/gs;
1524# }
1525
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527
1528 $darkness = new CFClient::Texture
1529 w => $sw4,
1530 h => $sh,
1531 data => $darkness,
1532 internalformat => GL_ALPHA,
1533 format => GL_ALPHA;
1534
1535 glColor 0.45, 0.45, 0.45, 1;
1536 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1537
1538 glDisable GL_TEXTURE_2D; 1816 glDisable GL_TEXTURE_2D;
1539 glDisable GL_BLEND;
1540
1541 glEndList;
1542 } 1817 }
1543 1818
1544 glCallList $self->{list}; 1819 $self->{children}[1]->draw;
1545 1820
1546 if ($FOCUS != $self) {
1547 glEnable GL_BLEND;
1548 glColor 0, 0, 1, 0.4;
1549 glBegin GL_QUADS;
1550 glVertex 0, 0;
1551 glVertex 0, $::HEIGHT;
1552 glVertex $::WIDTH, $::HEIGHT;
1553 glVertex $::WIDTH, 0;
1554 glEnd;
1555 glDisable GL_BLEND;
1556 }
1557}
1558
1559my %DIR = (
1560 SDLK_KP8, [1, "north"],
1561 SDLK_KP9, [2, "northeast"],
1562 SDLK_KP6, [3, "east"],
1563 SDLK_KP3, [4, "southeast"],
1564 SDLK_KP2, [5, "south"],
1565 SDLK_KP1, [6, "southwest"],
1566 SDLK_KP4, [7, "west"],
1567 SDLK_KP7, [8, "northwest"],
1568
1569 SDLK_UP, [1, "north"],
1570 SDLK_RIGHT, [3, "east"],
1571 SDLK_DOWN, [5, "south"],
1572 SDLK_LEFT, [7, "west"],
1573);
1574
1575sub key_down {
1576 my ($self, $ev) = @_;
1577
1578 my $mod = $ev->key_mod;
1579 my $sym = $ev->key_sym;
1580
1581 if ($sym == SDLK_KP5) {
1582 $::CONN->send ("command stay fire");
1583 } elsif ($sym == SDLK_a) {
1584 $::CONN->send ("command apply");
1585 } elsif (exists $DIR{$sym}) {
1586 if ($mod & KMOD_SHIFT) {
1587 $self->{shft}++;
1588 $::CONN->send ("command fire $DIR{$sym}[0]");
1589 } elsif ($mod & KMOD_CTRL) {
1590 $self->{ctrl}++;
1591 $::CONN->send ("command run $DIR{$sym}[0]");
1592 } else {
1593 $::CONN->send ("command $DIR{$sym}[1]");
1594 }
1595 }
1596}
1597
1598sub key_up {
1599 my ($self, $ev) = @_;
1600
1601 my $mod = $ev->key_mod;
1602 my $sym = $ev->key_sym;
1603
1604 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1605 $::CONN->send ("command fire_stop");
1606 }
1607 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1608 $::CONN->send ("command run_stop");
1609 }
1610} 1821}
1611 1822
1612############################################################################# 1823#############################################################################
1613 1824
1614package CFClient::UI::Animator; 1825package CFClient::UI::Animator;
… …
1651 glPopMatrix; 1862 glPopMatrix;
1652} 1863}
1653 1864
1654############################################################################# 1865#############################################################################
1655 1866
1656package CFClient::UI::Toplevel; 1867package CFClient::UI::Flopper;
1868
1869our @ISA = CFClient::UI::Button::;
1870
1871sub new {
1872 my $class = shift;
1873
1874 my $self = $class->SUPER::new (
1875 state => 0,
1876 connect_activate => \&toggle_flopper,
1877 @_
1878 );
1879
1880 if ($self->{state}) {
1881 $self->{state} = 0;
1882 $self->toggle_flopper;
1883 }
1884
1885 $self
1886}
1887
1888sub toggle_flopper {
1889 my ($self) = @_;
1890
1891 # TODO: use animation
1892 if ($self->{state} = !$self->{state}) {
1893 $CFClient::UI::ROOT->add ($self->{other});
1894 $self->{other}->move ($self->coord2global (0, $self->{h}));
1895 $self->emit ("open");
1896 } else {
1897 $CFClient::UI::ROOT->remove ($self->{other});
1898 $self->emit ("close");
1899 }
1900
1901 $self->emit (changed => $self->{state});
1902}
1903
1904#############################################################################
1905
1906package CFClient::UI::Root;
1657 1907
1658our @ISA = CFClient::UI::Container::; 1908our @ISA = CFClient::UI::Container::;
1909
1910use SDL::OpenGL;
1911
1912sub check_size {
1913 my ($self) = @_;
1914
1915 $self->configure (0, 0, $::WITH, $::HEIGHT);
1916}
1659 1917
1660sub size_request { 1918sub size_request {
1661 ($::WIDTH, $::HEIGHT) 1919 ($::WIDTH, $::HEIGHT)
1662} 1920}
1663 1921
1664sub size_allocate { 1922sub configure {
1665 my ($self, $x, $y, $w, $h) = @_; 1923 my ($self, $x, $y, $w, $h) = @_;
1666 1924
1667 $self->_size_allocate ($x, $y, $w, $h); 1925 $self->SUPER::configure ($x, $y, $w, $h);
1668 1926
1669 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1927 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1670 for @{$self->{children}}; 1928 for @{$self->{children}};
1671} 1929}
1672 1930
1673sub translate { 1931sub _topleft {
1674 my ($self, $x, $y) = @_; 1932 my ($self, $x, $y) = @_;
1675 1933
1676 ($x, $y) 1934 ($x, $y)
1677} 1935}
1678 1936
1679sub update { 1937sub update {
1680 my ($self) = @_; 1938 my ($self) = @_;
1681 1939
1682 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 1940 $self->check_size;
1683 ::refresh (); 1941 ::refresh ();
1684} 1942}
1685 1943
1686sub add { 1944sub add {
1687 my ($self, $widget) = @_; 1945 my ($self, $child) = @_;
1688 1946
1689 $self->SUPER::add ($widget); 1947 $self->SUPER::add ($child);
1948}
1690 1949
1691 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1950sub on_refresh {
1951 my ($self, $id, $cb) = @_;
1952
1953 $self->{refresh_hook}{$id} = $cb;
1692} 1954}
1693 1955
1694sub draw { 1956sub draw {
1695 my ($self) = @_; 1957 my ($self) = @_;
1696 1958
1959 while (my $rcb = delete $self->{refresh_hook}) {
1960 $_->() for values %$rcb;
1961 }
1962
1963 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1964 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1965 glClear GL_COLOR_BUFFER_BIT;
1966
1967 glMatrixMode GL_PROJECTION;
1968 glLoadIdentity;
1969 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1970 glMatrixMode GL_MODELVIEW;
1971 glLoadIdentity;
1972
1697 $self->_draw; 1973 $self->_draw;
1698} 1974}
1699 1975
1700############################################################################# 1976#############################################################################
1701 1977
1702package CFClient::UI; 1978package CFClient::UI;
1703 1979
1704$TOPLEVEL = new CFClient::UI::Toplevel; 1980$ROOT = new CFClient::UI::Root;
1705 1981
17061 19821
1707 1983

Diff Legend

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