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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines