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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.204 by root, Sun May 14 22:24:16 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
18
19sub check_tooltip {
20 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) {
25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 }
43
44 return;
45 }
46 }
47 }
48
49 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner};
51}
14 52
15# class methods for events 53# class methods for events
16sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
18} 57}
19 58
20sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
22} 62}
23 63
24sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
25 my ($ev) = @_; 65 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 68 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 69 my $widget = $ROOT->find_widget ($x, $y);
30 70
31 $GRAB = $widget; 71 $GRAB = $widget;
32 $GRAB->update if $GRAB; 72 $GRAB->update if $GRAB;
73
74 check_tooltip;
33 } 75 }
34 76
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 78
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
38} 83}
39 84
40sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
41 my ($ev) = @_; 86 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
43 88
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 90
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 92
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
49 97
50 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 100 $grab->update if $grab;
53 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
102
103 check_tooltip;
54 } 104 }
55} 105}
56 106
57sub feed_sdl_motion_event { 107sub feed_sdl_motion_event {
58 my ($ev) = @_; 108 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 113 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 114 my $hover = $HOVER; $HOVER = $widget;
65 115
66 $hover->update if $hover && $hover->{can_hover}; 116 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 118
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 check_tooltip;
120 }
121
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
71} 126}
72 127
73# convert position array to integers 128# convert position array to integers
74sub harmonize { 129sub harmonize {
75 my ($vals) = @_; 130 my ($vals) = @_;
… …
81 $rem += $_ - $i; 136 $rem += $_ - $i;
82 $_ = $i; 137 $_ = $i;
83 } 138 }
84} 139}
85 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
158 }
159}
160
86############################################################################# 161#############################################################################
87 162
88package CFClient::UI::Base; 163package CFClient::UI::Base;
89 164
90use strict; 165use strict;
… …
93 168
94sub new { 169sub new {
95 my $class = shift; 170 my $class = shift;
96 171
97 my $self = bless { 172 my $self = bless {
98 x => 0, 173 x => 0,
99 y => 0, 174 y => 0,
100 z => 0, 175 z => 0,
101 can_events => 1, 176 can_events => 1,
102 @_ 177 @_
103 }, $class; 178 }, $class;
104 179
105 for (keys %$self) { 180 for (keys %$self) {
106 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
107 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
108 } 183 }
109 } 184 }
110 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
111 $self 188 $self
112} 189}
113 190
191sub destroy {
192 my ($self) = @_;
193
194 $self->hide;
195 %$self = ();
196}
197
114sub show { 198sub show {
115 my ($self) = @_; 199 my ($self) = @_;
116 200
117 return if $self->{parent}; 201 return if $self->{parent};
118 202
… …
120} 204}
121 205
122sub hide { 206sub hide {
123 my ($self) = @_; 207 my ($self) = @_;
124 208
125 return unless $self->{parent}; 209 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self;
126 211
127 $self->{parent}->remove ($self); 212 $self->{parent}->remove ($self)
213 if $self->{parent};
128} 214}
129 215
130sub move { 216sub move {
131 my ($self, $x, $y, $z) = @_; 217 my ($self, $x, $y, $z) = @_;
132 218
… …
135 $self->{z} = $z if defined $z; 221 $self->{z} = $z if defined $z;
136 222
137 $self->update; 223 $self->update;
138} 224}
139 225
140sub needs_redraw { 226sub set_size {
141 0 227 my ($self, $w, $h) = @_;
228
229 $self->{user_w} = $w;
230 $self->{user_h} = $h;
231
232 $self->check_size;
142} 233}
143 234
144sub size_request { 235sub size_request {
145 require Carp; 236 require Carp;
146 Carp::confess "size_request is abstract"; 237 Carp::confess "size_request is abstract";
… …
166 $self->{y} = $y; 257 $self->{y} = $y;
167 $self->update; 258 $self->update;
168 } 259 }
169 260
170 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
171 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
172 $self->{h} = $h;
173
174 $self->size_allocate ($w, $h);
175 $self->update;
176 } 263 }
177} 264}
178 265
179sub size_allocate { 266sub size_allocate {
180 # nothing to be done 267 # nothing to be done
181} 268}
182 269
183# return top left coordinates 270sub reconfigure {
184sub _topleft { 271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
280sub set_max_size {
185 my ($self, $x, $y) = @_; 281 my ($self, $w, $h) = @_;
186 282
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h;
188} 285}
189 286
190# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
191sub coord2local { 288sub coord2local {
192 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
193 290
194 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
195 ($x - $X, $y - $Y)
196} 292}
197 293
198# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
199sub coord2global { 295sub coord2global {
200 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
201 297
202 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
203 ($x + $X, $y + $Y)
204} 299}
205 300
206sub focus_in { 301sub focus_in {
207 my ($self) = @_; 302 my ($self) = @_;
208 303
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 363 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 364 glVertex $x , $y + $self->{h};
270 glEnd; 365 glEnd;
271 glDisable GL_BLEND; 366 glDisable GL_BLEND;
272 } 367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0;
375 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h};
378 glEnd;
379 glPopMatrix;
380 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 }
273} 382}
274 383
275sub _draw { 384sub _draw {
276 my ($self) = @_; 385 my ($self) = @_;
277 386
… …
292 401
293sub set_parent { 402sub set_parent {
294 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
295 404
296 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
297} 410}
298 411
299sub check_size { 412sub check_size {
300 my ($self) = @_; 413 my ($self, $forced) = @_;
301 414
302 return unless $self->{parent}; 415 $self->{force_alloc} = 1 if $forced;
303 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
304 my ($w, $h) = $self->size_request;
305
306 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w;
308 $self->{req_h} = $h;
309
310 $self->{parent}->check_size;
311 }
312} 417}
313 418
314sub update { 419sub update {
315 my ($self) = @_; 420 my ($self) = @_;
316 421
… …
325} 430}
326 431
327sub emit { 432sub emit {
328 my ($self, $signal, @args) = @_; 433 my ($self, $signal, @args) = @_;
329 434
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
331 $cb->($self, @args);
332 }
333} 436}
334 437
335sub DESTROY { 438sub DESTROY {
336 my ($self) = @_; 439 my ($self) = @_;
337 440
441 delete $WIDGET{$self+0};
338 #$self->deactivate; 442 #$self->deactivate;
339} 443}
340 444
341############################################################################# 445#############################################################################
342 446
… …
404sub new { 508sub new {
405 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
406 510
407 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
408 512
409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
410 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
411 519
412 $self 520 $self
413} 521}
414 522
415sub add { 523sub add {
416 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
417 525
418 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
419 528
420 use sort 'stable'; 529 use sort 'stable';
421 530
422 $self->{children} = [ 531 $self->{children} = [
423 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
424 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
425 ]; 534 ];
426 535
427 $child->check_size; 536 $self->check_size (1);
537 $self->update;
538}
539
540sub children {
541 @{ $_[0]{children} }
428} 542}
429 543
430sub remove { 544sub remove {
431 my ($self, $child) = @_; 545 my ($self, $child) = @_;
432 546
433 delete $child->{parent}; 547 delete $child->{parent};
548 $child->hide;
434 549
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 551
437 $self->check_size; 552 $self->check_size;
553 $self->update;
554}
555
556sub clear {
557 my ($self) = @_;
558
559 my $children = delete $self->{children};
560 $self->{children} = [];
561
562 for (@$children) {
563 delete $_->{parent};
564 $_->hide;
565 }
566
567 $self->check_size;
568 $self->update;
438} 569}
439 570
440sub find_widget { 571sub find_widget {
441 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
442 573
… …
517} 648}
518 649
519sub update { 650sub update {
520 my ($self) = @_; 651 my ($self) = @_;
521 652
522 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 654 $self->SUPER::update;
525}
526
527sub render_chld {
528 my ($self) = @_;
529
530 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
531 glClearColor 0, 0, 0, 1;
532 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw;
534 };
535} 655}
536 656
537sub size_allocate { 657sub size_allocate {
538 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
539 659
540 $self->child->configure (0, 0, $w, $h); 660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
541 663
664sub _render {
665 $_[0]{children}[0]->draw;
666}
667
668sub render_child {
669 my ($self) = @_;
670
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT;
674
542 $self->render_chld; 675 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 };
543} 684}
544 685
545sub _draw { 686sub _draw {
546 my ($self) = @_; 687 my ($self) = @_;
547 688
548 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
549 690
550 my $tex = $self->{texture} 691 my $tex = $self->{texture}
551 or return; 692 or return;
552 693
553 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
557 697
558 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
559 699
560 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
562} 701}
563 702
564############################################################################# 703#############################################################################
565 704
566package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
567 706
568our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
569 708
570sub new { die }
571
572sub size_request { 709sub size_request {
573 my ($self) = @_; 710 my ($self) = @_;
574 711
575 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
577 714
578 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
579} 716}
580 717
581sub _draw { 718sub size_allocate {
582 my ($self) = @_; 719 my ($self, $w, $h) = @_;
583 720
584 $self->{children}[1]->draw; 721 $self->update;
585} 722}
586 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
587 726
588############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
589 729
730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
758 }
759}
760
761sub _render {
762 my ($self) = @_;
763
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765
766 $self->SUPER::_render;
767}
768
769#############################################################################
770
590package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
591 772
592our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
593
594use CFClient::OpenGL;
595 774
596sub new { 775sub new {
597 my $class = shift; 776 my $class = shift;
598 777
778 my $self;
779
780 my $slider = new CFClient::UI::Slider
781 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 },
786 ;
787
599 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
600 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
601 border_bg => [1, 1, 1, 1], 790 slider => $slider,
602 border => 0.8,
603 @_ 791 @_,
604 ); 792 );
605 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
606 $self 798 $self
607} 799}
608 800
609sub set_size { 801#TODO# update range on size_allocate depending on child
610 my ($self, $w, $h) = @_; 802# update viewport offset on scroll
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614}
615 803
616sub size_request { 804#############################################################################
617 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h})
619}
620 805
621sub size_allocate { 806package CFClient::UI::Frame;
622 my ($self, $w, $h) = @_; 807
623 $self->{w} = $w; 808our @ISA = CFClient::UI::Bin::;
624 $self->{h} = $h; 809
625 $self->child->configure (0, 0, $w, $h); 810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
626} 819}
627 820
628sub _draw { 821sub _draw {
629 my ($self) = @_; 822 my ($self) = @_;
630 823
631 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
632 826
633 glEnable GL_BLEND; 827 glEnable GL_BLEND;
634 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
635 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
636 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
637 830
638# glBegin GL_QUADS; 831 glBegin GL_QUADS;
639# glColor 0, 0, 0, 0;
640# glVertex 0 , 0; 832 glVertex 0 , 0;
641# glVertex 0 , $h; 833 glVertex 0 , $h;
642# glVertex $w, $h; 834 glVertex $w, $h;
643# glVertex $w, 0; 835 glVertex $w, 0;
644# glEnd; 836 glEnd;
645 837
646
647 $self->child->draw;
648 glDisable GL_BLEND; 838 glDisable GL_BLEND;
649 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
650} 842}
651 843
652############################################################################# 844#############################################################################
653 845
654package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
665 my $class = shift; 857 my $class = shift;
666 858
667 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
668 860
669 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
672 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
673 can_events => 1, 866 can_events => 1,
674 @_ 867 @_
675 ); 868 );
676 869
677 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
678 align => 0, 871 align => 0,
679 valign => 1, 872 valign => 1,
680 text => $self->{title}, 873 text => $self->{title},
681 fontsize => 1; 874 fontsize => $self->{border};
682 875
683 $self 876 $self
684} 877}
685 878
686sub border { 879sub border {
687 int $_[0]{border} * $::FONTSIZE 880 int $_[0]{border} * $::FONTSIZE
688} 881}
689 882
690sub size_request { 883sub size_request {
691 my ($self) = @_; 884 my ($self) = @_;
692
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694 885
695 my ($w, $h) = $self->SUPER::size_request; 886 my ($w, $h) = $self->SUPER::size_request;
696 887
697 ( 888 (
698 $w + $self->border * 2, 889 $w + $self->border * 2,
… …
713} 904}
714 905
715sub button_down { 906sub button_down {
716 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
717 908
909 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 910 my $border = $self->border;
719 911
720 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
725 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
726 $self->{motion} = sub { 923 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
728 925
729 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
730 928
731 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
733 $self->check_size; 932 $self->check_size;
734 }; 933 };
735 934
736 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
741 938
742 $self->{motion} = sub { 939 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
766 my ($self) = @_; 963 my ($self) = @_;
767 964
768 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
769 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
770 967
771 glEnable GL_BLEND;
772 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
773 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
775 970
776 my $border = $self->border; 971 my $border = $self->border;
777 972
778 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
779 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
780 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
782 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
783 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
784 my $bg = $tex[0]; 980 my $bg = $tex[0];
785 981
786 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
787 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
788 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
789 985
790 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
791 987
792 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
793 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
794 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
795 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
796 993
797 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
798 glDisable GL_BLEND;
799 995
800 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
801 $self->child->draw; 998 $self->child->draw;
802} 999}
803 1000
804############################################################################# 1001#############################################################################
805 1002
… …
827 $self->{children}[$y][$x] = $child; 1024 $self->{children}[$y][$x] = $child;
828 1025
829 $child->check_size; 1026 $child->check_size;
830} 1027}
831 1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
832# TODO: move to container class maybe? send childs a signal on removal? 1033# TODO: move to container class maybe? send childs a signal on removal?
833sub clear { 1034sub clear {
834 my ($self) = @_; 1035 my ($self) = @_;
835 1036
1037 my @children = $self->children;
836 delete $self->{children}; 1038 delete $self->{children};
1039
1040 for (@children) {
1041 delete $_->{parent};
1042 $_->hide;
1043 }
1044
837 $self->update; 1045 $self->update;
838} 1046}
839 1047
840sub get_wh { 1048sub get_wh {
841 my ($self) = @_; 1049 my ($self) = @_;
… …
1018} 1226}
1019 1227
1020sub size_allocate { 1228sub size_allocate {
1021 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1022 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1023 my $children = $self->{children}; 1233 my $children = $self->{children};
1024 1234
1025 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1026 1236
1027 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1064 1274
1065sub new { 1275sub new {
1066 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1067 1277
1068 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1070 fontsize => 1, 1284 fontsize => 1,
1071 text => "",
1072 align => -1, 1285 align => -1,
1073 valign => -1, 1286 valign => -1,
1074 padding => 2, 1287 padding => 2,
1075 layout => new CFClient::Layout,
1076 can_events => 0, 1288 can_events => 0,
1077 %arg 1289 %arg
1078 ); 1290 );
1079 1291
1080 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1081 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1082 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1083 $self->{template} = $layout; 1295 $self->{template} = $layout;
1084 } 1296 }
1085 1297
1086 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1299 $self->set_markup (delete $self->{markup});
1300 } else {
1301 $self->set_text (delete $self->{text});
1302 }
1088 1303
1089 $self 1304 $self
1090} 1305}
1091 1306
1092sub escape_text { 1307sub escape {
1093 local $_ = $_[1]; 1308 local $_ = $_[1];
1094 1309
1095 s/&/&amp;/g; 1310 s/&/&amp;/g;
1096 s/>/&gt;/g; 1311 s/>/&gt;/g;
1097 s/</&lt;/g; 1312 s/</&lt;/g;
1098 1313
1099 $_[1] 1314 $_[1]
1100} 1315}
1101 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
1102sub set_text { 1324sub set_text {
1103 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1104 1326
1327 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text";
1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1105 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1106 1332
1107 delete $self->{texture}; 1333 $self->update;
1108 $self->check_size; 1334 $self->check_size;
1109 $self->update;
1110} 1335}
1111 1336
1112sub set_markup { 1337sub set_markup {
1113 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1114 1339
1340 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup";
1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1115 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1116 1347
1117 delete $self->{texture}; 1348 $self->update;
1118 $self->check_size; 1349 $self->check_size;
1119 $self->update;
1120} 1350}
1121 1351
1122sub size_request { 1352sub size_request {
1123 my ($self) = @_; 1353 my ($self) = @_;
1124 1354
1125 $self->{layout}->set_width; 1355 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1);
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1358
1128 my ($w, $h) = $self->{layout}->size; 1359 my ($w, $h) = $self->{layout}->size;
1129 1360
1130 if (exists $self->{template}) { 1361 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1364
1133 my ($w2, $h2) = $self->{template}->size; 1365 my ($w2, $h2) = $self->{template}->size;
1134 1366
1135 $w = List::Util::max $w, $w2; 1367 $w = List::Util::max $w, $w2;
… …
1150 1382
1151sub set_fontsize { 1383sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1153 1385
1154 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1387 delete $self->{texture};
1388
1389 $self->update;
1155 $self->check_size; 1390 $self->check_size;
1156} 1391}
1157 1392
1158sub _draw { 1393sub _draw {
1159 my ($self) = @_; 1394 my ($self) = @_;
1160 1395
1161 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1164 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1165 }; 1413 };
1166 1414
1167 glEnable GL_BLEND;
1168 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1169 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1171 1417
1418 if ($tex->{format} == GL_ALPHA) {
1172 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1173
1174 $self->{ox} = int (
1175 $self->{align} < 0 ? $self->{padding}
1176 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1177 : ($self->{w} - $tex->{w}) * 0.5
1178 );
1179
1180 $self->{oy} = int (
1181 $self->{valign} < 0 ? $self->{padding}
1182 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1183 : ($self->{h} - $tex->{h}) * 0.5
1184 );
1185
1186 $tex->draw_quad ($self->{ox}, $self->{oy}); 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1187 1424
1188 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1189 glDisable GL_BLEND;
1190} 1426}
1191 1427
1192############################################################################# 1428#############################################################################
1193 1429
1194package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1199 1435
1200sub new { 1436sub new {
1201 my $class = shift; 1437 my $class = shift;
1202 1438
1203 $class->SUPER::new ( 1439 $class->SUPER::new (
1204 fg => [1, 1, 1], 1440 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1441 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1442 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1443 active_fg => [0, 0, 0],
1208 can_hover => 1, 1444 can_hover => 1,
1209 can_focus => 1, 1445 can_focus => 1,
1210 valign => 0, 1446 valign => 0,
1211 can_events => 1, 1447 can_events => 1,
1212 @_ 1448 @_
1213 ) 1449 )
1214} 1450}
1215 1451
… …
1229 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1230 1466
1231 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1232} 1468}
1233 1469
1470sub set_text {
1471 my ($self, $text) = @_;
1472
1473 $self->{cursor} = length $text;
1474 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477}
1478
1234sub get_text { 1479sub get_text {
1235 $_[0]{text} 1480 $_[0]{text}
1236} 1481}
1237 1482
1238sub size_request { 1483sub size_request {
… …
1245 1490
1246sub size_allocate { 1491sub size_allocate {
1247 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1248 1493
1249 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1250}
1251
1252sub set_text {
1253 my ($self, $text) = @_;
1254
1255 $self->{cursor} = length $text;
1256 $self->_set_text ($text);
1257 $self->update;
1258} 1495}
1259 1496
1260sub key_down { 1497sub key_down {
1261 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1262 1499
… …
1264 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1265 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1266 1503
1267 my $text = $self->get_text; 1504 my $text = $self->get_text;
1268 1505
1269 if ($sym == 8) { 1506 if ($uni == 8) {
1270 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1271 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1272 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1273 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1274 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1275 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1276 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1277 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1278 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1279 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1280 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1281 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1282 $self->emit ('escape'); 1519 $self->emit ('escape');
1283 } elsif ($uni) { 1520 } elsif ($uni) {
1284 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1285 } 1522 }
1286 1523
… …
1369 my ($self, $ev) = @_; 1606 my ($self, $ev) = @_;
1370 1607
1371 my $sym = $ev->{sym}; 1608 my $sym = $ev->{sym};
1372 1609
1373 if ($sym == 13) { 1610 if ($sym == 13) {
1611 unshift @{$self->{history}},
1612 my $txt = $self->get_text;
1613 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = '';
1374 $self->emit (activate => $self->get_text); 1615 $self->emit (activate => $txt);
1375 $self->update; 1616 $self->update;
1617
1618 } elsif ($sym == CFClient::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text;
1621 }
1622 if (@{$self->{history} || []} > 0) {
1623 $self->{history_pointer}++;
1624 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1625 $self->{history_pointer} = @{$self->{history} || []} - 1;
1626 }
1627 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1628 }
1629
1630 } elsif ($sym == CFClient::SDLK_DOWN) {
1631 $self->{history_pointer}--;
1632 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1633
1634 if ($self->{history_pointer} >= 0) {
1635 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1636 } else {
1637 $self->set_text ($self->{history_saveback});
1638 }
1376 1639
1377 } else { 1640 } else {
1378 $self->SUPER::key_down ($ev); 1641 $self->SUPER::key_down ($ev);
1379 } 1642 }
1380 1643
… …
1394 1657
1395sub new { 1658sub new {
1396 my $class = shift; 1659 my $class = shift;
1397 1660
1398 $class->SUPER::new ( 1661 $class->SUPER::new (
1399 padding => 4, 1662 padding => 4,
1400 fg => [1, 1, 1], 1663 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2], 1664 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1665 active_fg => [0, 0, 1],
1403 can_hover => 1, 1666 can_hover => 1,
1404 align => 0, 1667 align => 0,
1405 valign => 0, 1668 valign => 0,
1406 can_events => 1, 1669 can_events => 1,
1407 @_ 1670 @_
1408 ) 1671 )
1409} 1672}
1410 1673
… …
1424 1687
1425 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1426 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1427 } 1690 }
1428 1691
1429 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1433 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1434 1695
1435 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1436 1697
1437 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1438 glDisable GL_BLEND;
1439 1699
1440 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1441} 1701}
1442 1702
1443############################################################################# 1703#############################################################################
… …
1490 1750
1491 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1492 1752
1493 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1494 1754
1495 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1496 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1498
1499 my $tex = $self->{state} ? $tex[1] : $tex[0];
1500
1501 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1502
1503 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1504 glDisable GL_BLEND;
1505} 1760}
1506 1761
1507############################################################################# 1762#############################################################################
1508 1763
1509package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1552 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1553 1808
1554 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1555 } 1810 }
1556 1811
1557 glEnable GL_BLEND;
1558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1559 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 1814
1562 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1563 1816
1564 glDisable GL_BLEND;
1565 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1566} 1818}
1567 1819
1568############################################################################# 1820#############################################################################
1569 1821
1570package CFClient::UI::VGauge; 1822package CFClient::UI::VGauge;
1571 1823
1572our @ISA = CFClient::UI::Base::; 1824our @ISA = CFClient::UI::Base::;
1825
1826use List::Util qw(min max);
1573 1827
1574use CFClient::OpenGL; 1828use CFClient::OpenGL;
1575 1829
1576my %tex = ( 1830my %tex = (
1577 food => [ 1831 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1833 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1834 ],
1581 grace => [ 1835 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1837 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1584 ], 1838 ],
1585 hp => [ 1839 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1841 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1842 ],
1589 mana => [ 1843 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1844 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1845 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1592 ], 1846 ],
1593); 1847);
1594 1848
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1849# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 1850sub new {
… …
1615} 1869}
1616 1870
1617sub set_max { 1871sub set_max {
1618 my ($self, $max) = @_; 1872 my ($self, $max) = @_;
1619 1873
1874 return if $self->{max_val} == $max;
1875
1620 $self->{max_val} = $max; 1876 $self->{max_val} = $max;
1877 $self->update;
1621} 1878}
1622 1879
1623sub set_value { 1880sub set_value {
1624 my ($self, $val, $max) = @_; 1881 my ($self, $val, $max) = @_;
1625 1882
1626 $self->set_max ($max) 1883 $self->set_max ($max)
1627 if defined $max; 1884 if defined $max;
1628 1885
1629 $max = $self->{max_val}; 1886 return if $self->{val} == $val;
1887
1630 $self->{val} = $val; 1888 $self->{val} = $val;
1631
1632 $self->update; 1889 $self->update;
1633} 1890}
1634 1891
1635sub _draw { 1892sub _draw {
1636 my ($self) = @_; 1893 my ($self) = @_;
1637 1894
1638 my $tex = $tex{$self->{type}}; 1895 my $tex = $tex{$self->{type}};
1896 my ($t1, $t2, $t3) = @$tex;
1639 1897
1640 my ($w, $h) = ($self->{w}, $self->{h}); 1898 my ($w, $h) = ($self->{w}, $self->{h});
1641 1899
1642 if ($self->{vertical}) { 1900 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 1901 glRotate 90, 0, 0, 1;
… …
1645 1903
1646 ($w, $h) = ($h, $w); 1904 ($w, $h) = ($h, $w);
1647 } 1905 }
1648 1906
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 1907 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 1908
1652 my $t1 = $tex->[0]; 1909 my $ycut1 = max 0, min 1, $ycut;
1653 my $t2 = $tex->[1]; 1910 my $ycut2 = max 0, min 1, $ycut - 1;
1911
1912 my $h1 = $self->{h} * (1 - $ycut1);
1913 my $h2 = $self->{h} * (1 - $ycut2);
1654 1914
1655 glEnable GL_BLEND; 1915 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1916 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 1919
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1920 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 1921 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 1922 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1923 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1924 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1925 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 1926 glEnd;
1670 1927
1928 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1929 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 1930 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1931 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1932 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1933 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1934 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 glEnd; 1935 glEnd;
1936
1937 if ($t3) {
1938 glBindTexture GL_TEXTURE_2D, $t3->{name};
1939 glBegin GL_QUADS;
1940 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1941 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1942 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1943 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1944 glEnd;
1945 }
1678 1946
1679 glDisable GL_BLEND; 1947 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 1948 glDisable GL_TEXTURE_2D;
1681} 1949}
1682 1950
… …
1685package CFClient::UI::Gauge; 1953package CFClient::UI::Gauge;
1686 1954
1687our @ISA = CFClient::UI::VBox::; 1955our @ISA = CFClient::UI::VBox::;
1688 1956
1689sub new { 1957sub new {
1690 my ($class, %arg) = shift; 1958 my ($class, %arg) = @_;
1691 1959
1692 my $self = $class->SUPER::new ( 1960 my $self = $class->SUPER::new (
1693 @_, 1961 tooltip => $arg{type},
1962 can_hover => 1,
1963 can_events => 1,
1964 %arg,
1694 ); 1965 );
1695 1966
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 1967 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1968 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 1969 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 1970
1702 $self 1971 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 1972}
1709 1973
1710sub set_fontsize { 1974sub set_fontsize {
1711 my ($self, $fsize) = @_; 1975 my ($self, $fsize) = @_;
1712 1976
1713 $self->{value}->set_fontsize ($fsize); 1977 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 1978 $self->{max} ->set_fontsize ($fsize);
1715} 1979}
1716 1980
1981sub set_max {
1982 my ($self, $max) = @_;
1983
1984 $self->{gauge}->set_max ($max);
1985 $self->{max}->set_text ($max);
1986}
1987
1717sub set_value { 1988sub set_value {
1718 my ($self, $val, $max) = @_; 1989 my ($self, $val, $max) = @_;
1719 1990
1720 $self->set_max ($max) 1991 $self->set_max ($max)
1721 if defined $max; 1992 if defined $max;
1722 1993
1723 $self->{gauge}->set_value ($val, $max); 1994 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 1995 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 1996}
1733 1997
1734############################################################################# 1998#############################################################################
1735 1999
1736package CFClient::UI::Slider; 2000package CFClient::UI::Slider;
… …
1755 # TODO: calculations are off 2019 # TODO: calculations are off
1756 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1757 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1758 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1759 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1760 req_w => 20, 2024 req_w => $::WIDTH / 80,
1761 req_h => 20, 2025 req_h => $::WIDTH / 80,
1762 vertical => 0, 2026 vertical => 0,
1763 can_hover => 1, 2027 can_hover => 1,
1764 inner_pad => 5, 2028 inner_pad => 5,
1765 @_ 2029 @_
1766 ); 2030 );
… …
1849 $page ||= 2; 2113 $page ||= 2;
1850 2114
1851 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1852 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1853 2117
1854 glEnable GL_BLEND;
1855 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1856 glEnable GL_TEXTURE_2D; 2118 glEnable GL_TEXTURE_2D;
1857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1858 2120
1859 # draw background 2121 # draw background
1860 $tex[1]->draw_quad (0, 0, $w, $h); 2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1861 2123
1862 # draw handle 2124 # draw handle
1863 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2125 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1864 2126
1865 glDisable GL_BLEND;
1866 glDisable GL_TEXTURE_2D; 2127 glDisable GL_TEXTURE_2D;
1867} 2128}
1868 2129
1869############################################################################# 2130#############################################################################
1870 2131
… …
1876 2137
1877sub new { 2138sub new {
1878 my $class = shift; 2139 my $class = shift;
1879 2140
1880 my $self = $class->SUPER::new ( 2141 my $self = $class->SUPER::new (
1881 fontsize => 1, 2142 fontsize => 1,
2143 can_events => 0,
2144 #font => default_font
1882 @_, 2145 @_,
1883 2146
1884 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout 1),
1885 par => [], 2148 par => [],
1886 height => 0, 2149 height => 0,
1887 children => [ 2150 children => [
1888 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
1890 ], 2153 ],
1891 ); 2154 );
1892 2155
1893 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2157
1897 $self 2158 $self
1898} 2159}
1899 2160
1900sub set_fontsize { 2161sub set_fontsize {
… …
1908 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
1909 2170
1910 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
1911 2172
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
1914 $layout->set_text ($text); 2175 $layout->set_markup ($text);
1915 2176
1916 ($layout->size)[1] 2177 ($layout->size)[1]
1917} 2178}
1918 2179
1919sub reflow { 2180sub reflow {
… …
1926sub size_allocate { 2187sub size_allocate {
1927 my ($self, $w, $h) = @_; 2188 my ($self, $w, $h) = @_;
1928 2189
1929 $self->SUPER::size_allocate ($w, $h); 2190 $self->SUPER::size_allocate ($w, $h);
1930 2191
2192 $self->{layout}->set_font ($self->{font}) if $self->{font};
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2193 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1932 $self->{layout}->set_width ($self->{children}[0]{w}); 2194 $self->{layout}->set_width ($self->{children}[0]{w});
1933 2195
1934 $self->reflow; 2196 $self->reflow;
1935} 2197}
… …
1956 2218
1957 return unless $self->{h} > 0; 2219 return unless $self->{h} > 0;
1958 2220
1959 delete $self->{texture}; 2221 delete $self->{texture};
1960 2222
1961 $ROOT->on_refresh ($self, sub { 2223 $ROOT->on_post_alloc ($self, sub {
1962 if (delete $self->{need_reflow}) { 2224 if (delete $self->{need_reflow}) {
1963 my $height = 0; 2225 my $height = 0;
1964 2226
1965 $height += $_->[0] = $self->text_height ($_->[2]) 2227 $height += $_->[0] = $self->text_height ($_->[2])
1966 for @{$self->{par}}; 2228 for @{$self->{par}};
… …
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1971 2233
1972 delete $self->{texture}; 2234 delete $self->{texture};
1973 } 2235 }
1974 2236
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1976 glClearColor 0, 0, 0, 1; 2238 glClearColor 0, 0, 0, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
1978 2240
1979 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2241 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2243
1984 my $top = int $self->{children}[1]{range}[0]; 2244 my $top = int $self->{children}[1]{range}[0];
1985 2245
… …
1988 2248
1989 my $y = 0; 2249 my $y = 0;
1990 2250
1991 my $layout = $self->{layout}; 2251 my $layout = $self->{layout};
1992 2252
2253 $layout->set_font ($self->{font}) if $self->{font};
2254
1993 for my $par (@{$self->{par}}) { 2255 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2256 my $h = $par->[0];
1995 2257
1996 if ($y0 < $y + $h && $y < $y1) { 2258 if ($y0 < $y + $h && $y < $y1) {
2259 $layout->set_foreground (@{ $par->[1] });
1997 $layout->set_text ($par->[2]); 2260 $layout->set_markup ($par->[2]);
1998 2261
1999 glColor @{ $par->[1] };
2000 my ($W, $H) = $layout->size; 2262 my ($W, $H) = $layout->size;
2001 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2263 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2002 } 2264 }
2003 2265
2004 $y += $h; 2266 $y += $h;
2005 } 2267 }
2006 2268
2007 glDisable GL_TEXTURE_2D; 2269 glDisable GL_TEXTURE_2D;
2008 glDisable GL_BLEND;
2009 }; 2270 };
2010 }); 2271 });
2011} 2272}
2012 2273
2013sub _draw { 2274sub _draw {
2014 my ($self) = @_; 2275 my ($self) = @_;
2015 2276
2016 if ($self->{texture}) {
2017 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2018 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2019 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2279 glColor 1, 1, 1, 1;
2280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2020 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2021 }
2022 2282
2023 $self->{children}[1]->draw; 2283 $self->{children}[1]->draw;
2024 2284
2025} 2285}
2026 2286
… …
2074 2334
2075sub new { 2335sub new {
2076 my $class = shift; 2336 my $class = shift;
2077 2337
2078 my $self = $class->SUPER::new ( 2338 my $self = $class->SUPER::new (
2079 state => 0, 2339 state => 0,
2080 connect_activate => \&toggle_flopper, 2340 connect_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2341 @_
2083 ); 2342 );
2084 2343
2085 if ($self->{state}) { 2344 if ($self->{state}) {
2086 $self->{state} = 0; 2345 $self->{state} = 0;
… …
2106 $self->emit (changed => $self->{state}); 2365 $self->emit (changed => $self->{state});
2107} 2366}
2108 2367
2109############################################################################# 2368#############################################################################
2110 2369
2370package CFClient::UI::Tooltip;
2371
2372our @ISA = CFClient::UI::Bin::;
2373
2374use CFClient::OpenGL;
2375
2376sub new {
2377 my $class = shift;
2378
2379 $class->SUPER::new (
2380 @_,
2381 can_events => 0,
2382 )
2383}
2384
2385sub set_tooltip_from {
2386 my ($self, $widget) = @_;
2387
2388 $self->add (new CFClient::UI::Label
2389 markup => $widget->{tooltip},
2390 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2391 fontsize => 0.8,
2392 fg => [0, 0, 0, 1],
2393 font => ($widget->{tooltip_font} || $::FONT_PROP),
2394 );
2395}
2396
2397sub size_request {
2398 my ($self) = @_;
2399
2400 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2401
2402 ($w + 4, $h + 4)
2403}
2404
2405sub size_allocate {
2406 my ($self, $w, $h) = @_;
2407
2408 $self->SUPER::size_allocate ($w - 4, $h - 4);
2409}
2410
2411sub _draw {
2412 my ($self) = @_;
2413
2414 glTranslate 0.375, 0.375;
2415
2416 my ($w, $h) = @$self{qw(w h)};
2417
2418 glColor 1, 0.8, 0.4;
2419 glBegin GL_QUADS;
2420 glVertex 0 , 0;
2421 glVertex 0 , $h;
2422 glVertex $w, $h;
2423 glVertex $w, 0;
2424 glEnd;
2425
2426 glColor 0, 0, 0;
2427 glBegin GL_LINE_LOOP;
2428 glVertex 0 , 0;
2429 glVertex 0 , $h;
2430 glVertex $w, $h;
2431 glVertex $w, 0;
2432 glEnd;
2433
2434 glTranslate 2 - 0.375, 2 - 0.375;
2435 $self->SUPER::_draw;
2436}
2437
2438#############################################################################
2439
2440package CFClient::UI::Face;
2441
2442our @ISA = CFClient::UI::Base::;
2443
2444use CFClient::OpenGL;
2445
2446sub new {
2447 my $class = shift;
2448
2449 $class->SUPER::new (
2450 aspect => 1,
2451 @_,
2452 )
2453}
2454
2455sub size_request {
2456 (32, 8)
2457}
2458
2459sub _draw {
2460 my ($self) = @_;
2461
2462 return unless $::CONN;#d# manage and cache textures differently
2463 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2464
2465 # TODO animation
2466 if ($tex) {
2467 glEnable GL_TEXTURE_2D;
2468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2469 glColor 1, 1, 1, 1;
2470 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2471 glDisable GL_TEXTURE_2D;
2472 }
2473}
2474
2475#############################################################################
2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = delete $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525
2526 $self->add (new CFClient::UI::Face
2527 can_events => 0,
2528 face => $item->{face},
2529 anim => $item->{anim},
2530 animspeed => $item->{animspeed},
2531 );
2532
2533 $self->add (new CFClient::UI::Label
2534 can_events => 0,
2535 text => $desc,
2536 );
2537
2538 $self
2539}
2540
2541#############################################################################
2542
2543package CFClient::UI::Inventory;
2544
2545our @ISA = CFClient::UI::ScrolledWindow::;
2546
2547sub new {
2548 my $class = shift;
2549
2550 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox),
2552 @_,
2553 );
2554
2555 $self
2556}
2557
2558sub set_items {
2559 my ($self, $items) = @_;
2560
2561 $self->{scrolled}->clear;
2562 return unless $items;
2563
2564 my @items = sort {
2565 ($a->{type} <=> $b->{type})
2566 or ($a->{name} cmp $b->{name})
2567 } @$items;
2568
2569 $self->{real_items} = \@items;
2570
2571 for my $item (@items) {
2572 my $desc = $item->{nrof} < 2
2573 ? $item->{name}
2574 : "$item->{nrof} $item->{name_pl}";
2575
2576 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2577 }
2578
2579 $self->{scrolled}->add (@items);
2580
2581# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2582}
2583
2584sub size_request {
2585 my ($self) = @_;
2586 ($self->{req_w}, $self->{req_h});
2587}
2588
2589#############################################################################
2590
2591package CFClient::UI::Menu;
2592
2593our @ISA = CFClient::UI::FancyFrame::;
2594
2595use CFClient::OpenGL;
2596
2597sub new {
2598 my $class = shift;
2599
2600 my $self = $class->SUPER::new (
2601 items => [],
2602 z => 100,
2603 @_,
2604 );
2605
2606 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2607
2608 for my $item (@{ $self->{items} }) {
2609 my ($widget, $cb) = @$item;
2610
2611 # handle various types of items, only text for now
2612 if (!ref $widget) {
2613 $widget = new CFClient::UI::Label
2614 can_hover => 1,
2615 can_events => 1,
2616 text => $widget;
2617 }
2618
2619 $self->{item}{$widget} = $item;
2620
2621 $self->{vbox}->add ($widget);
2622 }
2623
2624 $self
2625}
2626
2627# popup given the event (must be a mouse button down event currently)
2628sub popup {
2629 my ($self, $ev) = @_;
2630
2631 $self->emit ("popdown");
2632
2633 # maybe save $GRAB? must be careful about events...
2634 $GRAB = $self;
2635 $self->{button} = $ev->{button};
2636
2637 $self->show;
2638 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2639}
2640
2641sub mouse_motion {
2642 my ($self, $ev, $x, $y) = @_;
2643
2644 # TODO: should use vbox->find_widget or so
2645 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2646 $self->{hover} = $self->{item}{$HOVER};
2647}
2648
2649sub button_up {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 if ($ev->{button} == $self->{button}) {
2653 undef $GRAB;
2654 $self->hide;
2655
2656 $self->emit ("popdown");
2657 $self->{hover}[1]->() if $self->{hover};
2658 }
2659}
2660
2661#############################################################################
2662
2663package CFClient::UI::Statusbox;
2664
2665our @ISA = CFClient::UI::VBox::;
2666
2667sub reorder {
2668 my ($self) = @_;
2669 my $NOW = time;
2670
2671 while (my ($k, $v) = each %{ $self->{item} }) {
2672 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2673 }
2674
2675 my @widgets;
2676
2677 my @items = sort {
2678 $a->{pri} <=> $b->{pri}
2679 or $b->{id} <=> $a->{id}
2680 } values %{ $self->{item} };
2681
2682 my $count = 10 + 1;
2683 for my $item (@items) {
2684 last unless --$count;
2685
2686 push @widgets, $item->{label} ||= do {
2687 # TODO: doesn't handle markup well (read as: at all)
2688 my $short = $item->{count} > 1
2689 ? "<b>$item->{count} ×</b> $item->{text}"
2690 : $item->{text};
2691
2692 for ($short) {
2693 s/^\s+//;
2694 s/\012.*/…/s;
2695 my $len = int 40 / $item->{fontsize};
2696 substr $_, $len, length, "…" if $len < length;
2697 }
2698
2699 new CFClient::UI::Label
2700 markup => $short,
2701 tooltip => $item->{tooltip},
2702 tooltip_font => $::FONT_PROP,
2703 tooltip_width => 0.67,
2704 fontsize => $item->{fontsize},
2705 color => $item->{color},
2706 can_events => 1,
2707 can_hover => 1
2708 };
2709 }
2710
2711 $self->clear;
2712 $self->SUPER::add (reverse @widgets);
2713}
2714
2715sub add {
2716 my ($self, $text, %arg) = @_;
2717
2718 $text =~ s/^\s+//;
2719 $text =~ s/\s+$//;
2720
2721 my $timeout = time + ((delete $arg{timeout}) || 60);
2722
2723 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2724
2725 if (my $item = $self->{item}{$group}) {
2726 if ($item->{text} eq $text) {
2727 $item->{count}++;
2728 } else {
2729 $item->{count} = 1;
2730 $item->{text} = $item->{tooltip} = $text;
2731 }
2732 $item->{id} = ++$self->{id};
2733 $item->{timeout} = $timeout;
2734 delete $item->{label};
2735 } else {
2736 $self->{item}{$group} = {
2737 id => ++$self->{id},
2738 text => $text,
2739 timeout => $timeout,
2740 tooltip => $text,
2741 fontsize => 0.8,
2742 color => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0,
2744 count => 1,
2745 %arg,
2746 };
2747 }
2748
2749 $self->reorder;
2750}
2751
2752#############################################################################
2753
2111package CFClient::UI::Root; 2754package CFClient::UI::Root;
2112 2755
2113our @ISA = CFClient::UI::Container::; 2756our @ISA = CFClient::UI::Container::;
2114 2757
2115use CFClient::OpenGL; 2758use CFClient::OpenGL;
2116 2759
2117sub check_size { 2760sub new {
2118 my ($self) = @_; 2761 my $class = shift;
2119 2762
2120 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2763 $class->SUPER::new (
2121} 2764 @_,
2122 2765 )
2123sub size_request {
2124 ($::WIDTH, $::HEIGHT)
2125} 2766}
2126 2767
2127sub configure { 2768sub configure {
2128 my ($self, $x, $y, $w, $h) = @_; 2769 my ($self, $x, $y, $w, $h) = @_;
2129 2770
2130 $self->SUPER::configure ($x, $y, $w, $h); 2771 $self->{w} = $w;
2772 $self->{h} = $h;
2773}
2131 2774
2775sub check_size {
2776 my ($self) = @_;
2777
2778 $self->size_allocate ($self->{w}, $self->{h})
2779 if $self->{w};
2780}
2781
2782sub size_request {
2783 my ($self) = @_;
2784
2785 ($self->{w}, $self->{h})
2786}
2787
2788sub size_allocate {
2789 my ($self, $w, $h) = @_;
2790
2791 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2792 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2793
2794 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2795 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2796
2132 for my $child (@{$self->{children}}) { 2797 for my $child ($self->children) {
2133 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2134 2799
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2800 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2136 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2801 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2137 $child->configure ($X, $Y, $W,$H); 2802 $child->configure ($X, $Y, $W, $H);
2138 } 2803 }
2139} 2804}
2140 2805
2141sub _topleft { 2806sub coord2local {
2142 my ($self, $x, $y) = @_; 2807 my ($self, $x, $y) = @_;
2143 2808
2144 ($x, $y) 2809 ($x, $y)
2145} 2810}
2146 2811
2812sub coord2global {
2813 my ($self, $x, $y) = @_;
2814
2815 ($x, $y)
2816}
2817
2147sub update { 2818sub update {
2148 my ($self) = @_; 2819 my ($self) = @_;
2149 2820
2150 $self->check_size; 2821 $self->check_size;
2151 ::refresh (); 2822 $::WANT_REFRESH++;
2152} 2823}
2153 2824
2154sub add { 2825sub add {
2155 my ($self, $child) = @_; 2826 my ($self, @children) = @_;
2156 2827
2828 for my $child (@children) {
2829 $child->{toplevel} = 1;
2830
2157 # integerize window positions 2831 # integerise window positions
2158 $child->{x} = int $child->{x}; 2832 $child->{x} = int $child->{x};
2159 $child->{y} = int $child->{y}; 2833 $child->{y} = int $child->{y};
2834 }
2160 2835
2161 $self->SUPER::add ($child); 2836 $self->SUPER::add (@children);
2162} 2837}
2163 2838
2164sub on_refresh { 2839sub on_refresh {
2165 my ($self, $id, $cb) = @_; 2840 my ($self, $id, $cb) = @_;
2166 2841
2167 $self->{refresh_hook}{$id} = $cb; 2842 $self->{refresh_hook}{$id} = $cb;
2168} 2843}
2169 2844
2845sub on_post_alloc {
2846 my ($self, $id, $cb) = @_;
2847
2848 $self->{post_alloc_hook}{$id} = $cb;
2849}
2850
2170sub draw { 2851sub draw {
2171 my ($self) = @_; 2852 my ($self) = @_;
2172 2853
2173 while (my $rcb = delete $self->{refresh_hook}) { 2854 while ($self->{refresh_hook}) {
2174 $_->() for values %$rcb; 2855 $_->()
2856 for values %{delete $self->{refresh_hook}};
2857 }
2858
2859 if ($self->{check_size}) {
2860 my @queue = ([], []);
2861
2862 for (;;) {
2863 if ($self->{check_size}) {
2864 # heuristic: check containers last
2865 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2866 for values %{delete $self->{check_size}}
2867 }
2868
2869 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2870
2871 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2872 ? @$widget{qw(user_w user_h)}
2873 : $widget->size_request;
2874
2875 if (delete $widget->{force_alloc}
2876 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2877 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2878
2879 $widget->{req_w} = $w;
2880 $widget->{req_h} = $h;
2881
2882 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2883
2884 $widget->{parent}->check_size
2885 if $widget->{parent};
2886 }
2887 }
2888 }
2889
2890 while ($self->{size_alloc}) {
2891 for (values %{delete $self->{size_alloc}}) {
2892 my ($widget, $w, $h) = @$_;
2893
2894 $w = 0 if $w < 0;
2895 $h = 0 if $h < 0;
2896
2897 $widget->{w} = $w;
2898 $widget->{h} = $h;
2899 $widget->size_allocate ($w, $h);
2900 $widget->emit (size_allocate => $w, $h);
2901 }
2902 }
2903
2904 while ($self->{post_alloc_hook}) {
2905 $_->()
2906 for values %{delete $self->{post_alloc_hook}};
2175 } 2907 }
2176 2908
2177 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2178 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2179 glClear GL_COLOR_BUFFER_BIT; 2911 glClear GL_COLOR_BUFFER_BIT;
… …
2190############################################################################# 2922#############################################################################
2191 2923
2192package CFClient::UI; 2924package CFClient::UI;
2193 2925
2194$ROOT = new CFClient::UI::Root; 2926$ROOT = new CFClient::UI::Root;
2927$TOOLTIP = new CFClient::UI::Tooltip;
2195 2928
21961 29291
2197 2930

Diff Legend

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