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

Diff Legend

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