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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 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
… …
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
16sub check_tooltip { 17sub check_tooltip {
17 if (!$GRAB) { 18 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 20 if (length $widget->{tooltip}) {
20 21
21 if ($TOOLTIP->{owner} != $widget) { 22 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 23 $TOOLTIP->{owner} = $widget;
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 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;
31 } 41 }
32 42
33 return; 43 return;
34 } 44 }
35 } 45 }
… …
39 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
40} 50}
41 51
42# class methods for events 52# class methods for events
43sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
45} 56}
46 57
47sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
49} 61}
50 62
51sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
52 my ($ev) = @_; 64 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 73 check_tooltip;
62 } 74 }
63 75
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 77
66 $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 }
67} 82}
68 83
69sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
70 my ($ev) = @_; 85 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
72 87
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 89
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 91
77 $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 }
78 96
79 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 99 $grab->update if $grab;
82 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 117
100 check_tooltip; 118 check_tooltip;
101 } 119 }
102 120
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 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 }
104} 125}
105 126
106# convert position array to integers 127# convert position array to integers
107sub harmonize { 128sub harmonize {
108 my ($vals) = @_; 129 my ($vals) = @_;
… …
126 147
127sub new { 148sub new {
128 my $class = shift; 149 my $class = shift;
129 150
130 my $self = bless { 151 my $self = bless {
131 x => 0, 152 x => 0,
132 y => 0, 153 y => 0,
133 z => 0, 154 z => 0,
134 can_events => 1, 155 can_events => 1,
135 @_ 156 @_
136 }, $class; 157 }, $class;
137 158
138 for (keys %$self) { 159 for (keys %$self) {
… …
142 } 163 }
143 164
144 $self 165 $self
145} 166}
146 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
147sub show { 175sub show {
148 my ($self) = @_; 176 my ($self) = @_;
149 177
150 return if $self->{parent}; 178 return if $self->{parent};
151 179
… …
153} 181}
154 182
155sub hide { 183sub hide {
156 my ($self) = @_; 184 my ($self) = @_;
157 185
158 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
159 188
160 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
161} 191}
162 192
163sub move { 193sub move {
164 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
165 195
… …
168 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
169 199
170 $self->update; 200 $self->update;
171} 201}
172 202
173sub needs_redraw { 203sub set_size {
174 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
175} 210}
176 211
177sub size_request { 212sub size_request {
178 require Carp; 213 require Carp;
179 Carp::confess "size_request is abstract"; 214 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 234 $self->{y} = $y;
200 $self->update; 235 $self->update;
201 } 236 }
202 237
203 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 240 }
210} 241}
211 242
212sub size_allocate { 243sub size_allocate {
213 # nothing to be done 244 # nothing to be done
214} 245}
215 246
247sub children {
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;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
216sub set_max_size { 262sub set_max_size {
217 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
218 264
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 delete $self->{max_h}; $self->{max_h} = $h if $h;
221}
222
223# return top left coordinates
224sub _topleft {
225 my ($self, $x, $y) = @_;
226
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 267}
229 268
230# translate global coordinates to local coordinate system 269# translate global coordinates to local coordinate system
231sub coord2local { 270sub coord2local {
232 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
233 272
234 my ($X, $Y) = $self->_topleft; 273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 274}
237 275
238# translate local coordinates to global coordinate system 276# translate local coordinates to global coordinate system
239sub coord2global { 277sub coord2global {
240 my ($self, $x, $y) = @_; 278 my ($self, $x, $y) = @_;
241 279
242 my ($X, $Y) = $self->_topleft; 280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 281}
245 282
246sub focus_in { 283sub focus_in {
247 my ($self) = @_; 284 my ($self) = @_;
248 285
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 345 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 346 glVertex $x , $y + $self->{h};
310 glEnd; 347 glEnd;
311 glDisable GL_BLEND; 348 glDisable GL_BLEND;
312 } 349 }
350
351 if ($ENV{PCLIENT_DEBUG}) {
352 glPushMatrix;
353 glColor 1, 1, 0, 1;
354 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355 glBegin GL_LINE_LOOP;
356 glVertex 0 , 0;
357 glVertex $self->{w}, 0;
358 glVertex $self->{w}, $self->{h};
359 glVertex 0 , $self->{h};
360 glEnd;
361 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 }
313} 364}
314 365
315sub _draw { 366sub _draw {
316 my ($self) = @_; 367 my ($self) = @_;
317 368
… …
332 383
333sub set_parent { 384sub set_parent {
334 my ($self, $parent) = @_; 385 my ($self, $parent) = @_;
335 386
336 Scalar::Util::weaken ($self->{parent} = $parent); 387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
337} 391}
338 392
339sub check_size { 393sub check_size {
340 my ($self) = @_; 394 my ($self, $forced) = @_;
341 395
342 return unless $self->{parent}; 396 $self->{force_alloc} = 1 if $forced;
343 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352} 398}
353 399
354sub update { 400sub update {
355 my ($self) = @_; 401 my ($self) = @_;
356 402
… …
365} 411}
366 412
367sub emit { 413sub emit {
368 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
369 415
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 417}
374 418
375sub DESTROY { 419sub DESTROY {
376 my ($self) = @_; 420 my ($self) = @_;
377 421
… …
444sub new { 488sub new {
445 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
446 490
447 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
448 492
449 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 );
450 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
451 499
452 $self 500 $self
453} 501}
454 502
455sub add { 503sub add {
456 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
457 505
458 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
459 508
460 use sort 'stable'; 509 use sort 'stable';
461 510
462 $self->{children} = [ 511 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
465 ]; 514 ];
466 515
467 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
468} 522}
469 523
470sub remove { 524sub remove {
471 my ($self, $child) = @_; 525 my ($self, $child) = @_;
472 526
473 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
474 529
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531
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 }
476 546
477 $self->check_size; 547 $self->check_size;
478 $self->update; 548 $self->update;
479} 549}
480 550
… …
558} 628}
559 629
560sub update { 630sub update {
561 my ($self) = @_; 631 my ($self) = @_;
562 632
563 # we want to do this delayed... 633 $ROOT->on_refresh ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 634 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 635}
577 636
578sub size_allocate { 637sub size_allocate {
579 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
580 639
581 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
582 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
583 $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 };
584} 664}
585 665
586sub _draw { 666sub _draw {
587 my ($self) = @_; 667 my ($self) = @_;
588 668
589 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
590 670
591 my $tex = $self->{texture} 671 my $tex = $self->{texture}
592 or return; 672 or return;
593 673
594 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
597 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;
598 677
599 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600 679
601 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
603} 681}
604 682
605############################################################################# 683#############################################################################
606 684
607package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
608 686
609our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
610 688
611sub new { die }
612
613sub size_request { 689sub size_request {
614 my ($self) = @_; 690 my ($self) = @_;
615 691
616 @$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)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 694
619 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
620} 696}
621 697
622sub _draw { 698sub size_allocate {
623 my ($self) = @_; 699 my ($self, $w, $h) = @_;
624 700
625 $self->{children}[1]->draw; 701 $self->update;
626} 702}
627 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
628 706
629############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
630 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
631package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
632 752
633our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
634
635use CFClient::OpenGL;
636 754
637sub new { 755sub new {
638 my $class = shift; 756 my $class = shift;
639 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
640 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
641 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
642 border_bg => [1, 1, 1, 1], 770 slider => $slider,
643 border => 0.8,
644 @_ 771 @_,
645 ); 772 );
646 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
647 $self 778 $self
648} 779}
649 780
650sub set_size { 781#TODO# update range on size_allocate depeneing on child
651 my ($self, $w, $h) = @_; 782# update viewport offset on scroll
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656 783
657sub size_request { 784#############################################################################
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661 785
662sub size_allocate { 786package CFClient::UI::Frame;
663 my ($self, $w, $h) = @_;
664 $self->{w} = $w;
665 $self->{h} = $h;
666 $self->child->configure (0, 0, $w, $h);
667}
668 787
669sub _draw { 788our @ISA = CFClient::UI::Bin::;
670 my ($self) = @_;
671 789
672 my ($w, $h) = ($self->{w}, $self->{h}); 790use CFClient::OpenGL;
673
674 glEnable GL_BLEND;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glEnable GL_TEXTURE_2D;
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678
679# glBegin GL_QUADS;
680# glColor 0, 0, 0, 0;
681# glVertex 0 , 0;
682# glVertex 0 , $h;
683# glVertex $w, $h;
684# glVertex $w, 0;
685# glEnd;
686
687
688 $self->child->draw;
689 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D;
691}
692 791
693############################################################################# 792#############################################################################
694 793
695package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
696 795
… …
706 my $class = shift; 805 my $class = shift;
707 806
708 # TODO: user_x, user_y, overwrite moveto? 807 # TODO: user_x, user_y, overwrite moveto?
709 808
710 my $self = $class->SUPER::new ( 809 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 810 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 811 border_bg => [1, 1, 1, 1],
713 border => 0.8, 812 border => 0.6,
714 can_events => 1, 813 can_events => 1,
715 @_ 814 @_
716 ); 815 );
717 816
718 $self->{title} &&= new CFClient::UI::Label 817 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 818 align => 0,
720 valign => 1, 819 valign => 1,
721 text => $self->{title}, 820 text => $self->{title},
722 fontsize => 1; 821 fontsize => $self->{border};
723 822
724 $self 823 $self
725} 824}
726 825
727sub border { 826sub border {
728 int $_[0]{border} * $::FONTSIZE 827 int $_[0]{border} * $::FONTSIZE
729} 828}
730 829
731sub size_request { 830sub size_request {
732 my ($self) = @_; 831 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 832
736 my ($w, $h) = $self->SUPER::size_request; 833 my ($w, $h) = $self->SUPER::size_request;
737 834
738 ( 835 (
739 $w + $self->border * 2, 836 $w + $self->border * 2,
… …
754} 851}
755 852
756sub button_down { 853sub button_down {
757 my ($self, $ev, $x, $y) = @_; 854 my ($self, $ev, $x, $y) = @_;
758 855
856 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 857 my $border = $self->border;
760 858
761 if ($x < $self->{w} && $x >= $self->{w} - $border 859 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 860 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 861
862 if ($lr & $td) {
863 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 865 my ($bw, $bh) = ($self->{w}, $self->{h});
766 866
867 my $mx = $x < $border;
868 my $my = $y < $border;
869
767 $self->{motion} = sub { 870 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 871 my ($ev, $x, $y) = @_;
769 872
770 ($x, $y) = ($ev->{x}, $ev->{y}); 873 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy;
771 875
772 $self->{user_w} = $bw + $x - $ox; 876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 879 $self->check_size;
775 }; 880 };
776 881
777 } elsif ($x >= 0 && $x < $self->{w} 882 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 883 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 884 my ($bx, $by) = ($self->{x}, $self->{y});
782 885
783 $self->{motion} = sub { 886 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 887 my ($ev, $x, $y) = @_;
… …
807 my ($self) = @_; 910 my ($self) = @_;
808 911
809 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
810 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811 914
812 glEnable GL_BLEND;
813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816 917
817 my $border = $self->border; 918 my $border = $self->border;
818 919
819 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
820 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
824 925
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 927 my $bg = $tex[0];
826 928
827 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 930 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 931 my $rep_y = $ch / $bg->{h};
830 932
831 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
832 934
833 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
837 940
838 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND;
840 942
841 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
944
842 $self->child->draw; 945 $self->child->draw;
843} 946}
844 947
845############################################################################# 948#############################################################################
846 949
… …
868 $self->{children}[$y][$x] = $child; 971 $self->{children}[$y][$x] = $child;
869 972
870 $child->check_size; 973 $child->check_size;
871} 974}
872 975
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
873# TODO: move to container class maybe? send childs a signal on removal? 980# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 981sub clear {
875 my ($self) = @_; 982 my ($self) = @_;
876 983
984 my @children = $self->children;
877 delete $self->{children}; 985 delete $self->{children};
986
987 for (@children) {
988 delete $_->{parent};
989 $_->hide;
990 }
991
878 $self->update; 992 $self->update;
879} 993}
880 994
881sub get_wh { 995sub get_wh {
882 my ($self) = @_; 996 my ($self) = @_;
… …
1059} 1173}
1060 1174
1061sub size_allocate { 1175sub size_allocate {
1062 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1063 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1064 my $children = $self->{children}; 1180 my $children = $self->{children};
1065 1181
1066 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1067 1183
1068 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1105 1221
1106sub new { 1222sub new {
1107 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1108 1224
1109 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1111 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1112 fontsize => 1, 1231 fontsize => 1,
1113 text => "",
1114 align => -1, 1232 align => -1,
1115 valign => -1, 1233 valign => -1,
1116 padding => 2, 1234 padding => 2,
1117 layout => new CFClient::Layout,
1118 can_events => 0, 1235 can_events => 0,
1119 %arg 1236 %arg
1120 ); 1237 );
1121 1238
1122 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout; 1242 $self->{template} = $layout;
1126 } 1243 }
1127 1244
1128 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1246 $self->set_markup (delete $self->{markup});
1247 } else {
1248 $self->set_text (delete $self->{text});
1249 }
1130 1250
1131 $self 1251 $self
1132} 1252}
1133 1253
1134sub escape_text { 1254sub escape {
1135 local $_ = $_[1]; 1255 local $_ = $_[1];
1136 1256
1137 s/&/&amp;/g; 1257 s/&/&amp;/g;
1138 s/>/&gt;/g; 1258 s/>/&gt;/g;
1139 s/</&lt;/g; 1259 s/</&lt;/g;
1140 1260
1141 $_[1] 1261 $_[1]
1142} 1262}
1143 1263
1264sub update {
1265 my ($self) = @_;
1266
1267 delete $self->{texture};
1268 $self->SUPER::update;
1269}
1270
1144sub set_text { 1271sub set_text {
1145 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1146 1273
1274 return if $self->{text} eq "T$text";
1275 $self->{text} = "T$text";
1276
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1147 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1148 1279
1149 delete $self->{texture}; 1280 $self->update;
1150 $self->check_size; 1281 $self->check_size;
1151 $self->update;
1152} 1282}
1153 1283
1154sub set_markup { 1284sub set_markup {
1155 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1156 1286
1287 return if $self->{text} eq "M$markup";
1288 $self->{text} = "M$markup";
1289
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1157 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1158 1294
1159 delete $self->{texture}; 1295 $self->update;
1160 $self->check_size; 1296 $self->check_size;
1161 $self->update;
1162} 1297}
1163 1298
1164sub size_request { 1299sub size_request {
1165 my ($self) = @_; 1300 my ($self) = @_;
1166 1301
… …
1195sub set_fontsize { 1330sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1331 my ($self, $fontsize) = @_;
1197 1332
1198 $self->{fontsize} = $fontsize; 1333 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1334 delete $self->{texture};
1335
1336 $self->update;
1200 $self->check_size; 1337 $self->check_size;
1201 $self->update;
1202} 1338}
1203 1339
1204sub _draw { 1340sub _draw {
1205 my ($self) = @_; 1341 my ($self) = @_;
1206 1342
1207 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1348
1211 new_from_layout CFClient::Texture $self->{layout} 1349 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5;
1354
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5;
1358
1359 $tex
1212 }; 1360 };
1213 1361
1214 glEnable GL_BLEND;
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1364
1365 if ($tex->{format} == GL_ALPHA) {
1219 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1220
1221 $self->{ox} = int (
1222 $self->{align} < 0 ? $self->{padding}
1223 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224 : ($self->{w} - $tex->{w}) * 0.5
1225 );
1226
1227 $self->{oy} = int (
1228 $self->{valign} < 0 ? $self->{padding}
1229 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230 : ($self->{h} - $tex->{h}) * 0.5
1231 );
1232
1233 $tex->draw_quad ($self->{ox}, $self->{oy}); 1367 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1368 } else {
1369 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1370 }
1234 1371
1235 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1373}
1238 1374
1239############################################################################# 1375#############################################################################
1240 1376
1241package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1246 1382
1247sub new { 1383sub new {
1248 my $class = shift; 1384 my $class = shift;
1249 1385
1250 $class->SUPER::new ( 1386 $class->SUPER::new (
1251 fg => [1, 1, 1], 1387 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1388 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1389 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1390 active_fg => [0, 0, 0],
1255 can_hover => 1, 1391 can_hover => 1,
1256 can_focus => 1, 1392 can_focus => 1,
1257 valign => 0, 1393 valign => 0,
1258 can_events => 1, 1394 can_events => 1,
1259 @_ 1395 @_
1260 ) 1396 )
1261} 1397}
1262 1398
… …
1276 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1277 1413
1278 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1279} 1415}
1280 1416
1417sub set_text {
1418 my ($self, $text) = @_;
1419
1420 $self->{cursor} = length $text;
1421 $self->_set_text ($text);
1422 $self->check_size;
1423 $self->update;
1424}
1425
1281sub get_text { 1426sub get_text {
1282 $_[0]{text} 1427 $_[0]{text}
1283} 1428}
1284 1429
1285sub size_request { 1430sub size_request {
… …
1292 1437
1293sub size_allocate { 1438sub size_allocate {
1294 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1295 1440
1296 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1297}
1298
1299sub set_text {
1300 my ($self, $text) = @_;
1301
1302 $self->{cursor} = length $text;
1303 $self->_set_text ($text);
1304 $self->update;
1305} 1442}
1306 1443
1307sub key_down { 1444sub key_down {
1308 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1309 1446
… …
1416 my ($self, $ev) = @_; 1553 my ($self, $ev) = @_;
1417 1554
1418 my $sym = $ev->{sym}; 1555 my $sym = $ev->{sym};
1419 1556
1420 if ($sym == 13) { 1557 if ($sym == 13) {
1558 unshift @{$self->{history}},
1559 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1562 $self->emit (activate => $txt);
1422 $self->update; 1563 $self->update;
1564
1565 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text;
1568 }
1569 if (@{$self->{history} || []} > 0) {
1570 $self->{history_pointer}++;
1571 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1572 $self->{history_pointer} = @{$self->{history} || []} - 1;
1573 }
1574 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1575 }
1576
1577 } elsif ($sym == CFClient::SDLK_DOWN) {
1578 $self->{history_pointer}--;
1579 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1580
1581 if ($self->{history_pointer} >= 0) {
1582 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1583 } else {
1584 $self->set_text ($self->{history_saveback});
1585 }
1423 1586
1424 } else { 1587 } else {
1425 $self->SUPER::key_down ($ev); 1588 $self->SUPER::key_down ($ev);
1426 } 1589 }
1427 1590
… …
1441 1604
1442sub new { 1605sub new {
1443 my $class = shift; 1606 my $class = shift;
1444 1607
1445 $class->SUPER::new ( 1608 $class->SUPER::new (
1446 padding => 4, 1609 padding => 4,
1447 fg => [1, 1, 1], 1610 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1611 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1612 active_fg => [0, 0, 1],
1450 can_hover => 1, 1613 can_hover => 1,
1451 align => 0, 1614 align => 0,
1452 valign => 0, 1615 valign => 0,
1453 can_events => 1, 1616 can_events => 1,
1454 @_ 1617 @_
1455 ) 1618 )
1456} 1619}
1457 1620
… …
1471 1634
1472 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1473 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1474 } 1637 }
1475 1638
1476 glEnable GL_BLEND;
1477 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1481 1642
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1644
1484 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1646
1487 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1488} 1648}
1489 1649
1490############################################################################# 1650#############################################################################
… …
1537 1697
1538 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1539 1699
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 1701
1542 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1543 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546 my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 1707}
1553 1708
1554############################################################################# 1709#############################################################################
1555 1710
1556package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1599 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1600 1755
1601 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1602 } 1757 }
1603 1758
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 1761
1609 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 1763
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1613} 1765}
1614 1766
1615############################################################################# 1767#############################################################################
1616 1768
1617package CFClient::UI::VGauge; 1769package CFClient::UI::VGauge;
1618 1770
1619our @ISA = CFClient::UI::Base::; 1771our @ISA = CFClient::UI::Base::;
1772
1773use List::Util qw(min max);
1620 1774
1621use CFClient::OpenGL; 1775use CFClient::OpenGL;
1622 1776
1623my %tex = ( 1777my %tex = (
1624 food => [ 1778 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1779 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1780 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1781 ],
1628 grace => [ 1782 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1783 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1784 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1785 ],
1632 hp => [ 1786 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1787 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1788 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1789 ],
1636 mana => [ 1790 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1791 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1792 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1793 ],
1640); 1794);
1641 1795
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1796# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1797sub new {
… …
1662} 1816}
1663 1817
1664sub set_max { 1818sub set_max {
1665 my ($self, $max) = @_; 1819 my ($self, $max) = @_;
1666 1820
1821 return if $self->{max_val} == $max;
1822
1667 $self->{max_val} = $max; 1823 $self->{max_val} = $max;
1824 $self->update;
1668} 1825}
1669 1826
1670sub set_value { 1827sub set_value {
1671 my ($self, $val, $max) = @_; 1828 my ($self, $val, $max) = @_;
1672 1829
1673 $self->set_max ($max) 1830 $self->set_max ($max)
1674 if defined $max; 1831 if defined $max;
1675 1832
1676 $max = $self->{max_val}; 1833 return if $self->{val} == $val;
1834
1677 $self->{val} = $val; 1835 $self->{val} = $val;
1678
1679 $self->update; 1836 $self->update;
1680} 1837}
1681 1838
1682sub _draw { 1839sub _draw {
1683 my ($self) = @_; 1840 my ($self) = @_;
1684 1841
1685 my $tex = $tex{$self->{type}}; 1842 my $tex = $tex{$self->{type}};
1843 my ($t1, $t2, $t3) = @$tex;
1686 1844
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1845 my ($w, $h) = ($self->{w}, $self->{h});
1688 1846
1689 if ($self->{vertical}) { 1847 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1848 glRotate 90, 0, 0, 1;
… …
1692 1850
1693 ($w, $h) = ($h, $w); 1851 ($w, $h) = ($h, $w);
1694 } 1852 }
1695 1853
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1854 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1855
1699 my $t1 = $tex->[0]; 1856 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1857 my $ycut2 = max 0, min 1, $ycut - 1;
1858
1859 my $h1 = $self->{h} * (1 - $ycut1);
1860 my $h2 = $self->{h} * (1 - $ycut2);
1701 1861
1702 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1864 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1866
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1867 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1868 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1869 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1870 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1871 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1872 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1873 glEnd;
1717 1874
1875 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1876 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1877 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1878 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1879 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1880 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1881 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1882 glEnd;
1883
1884 if ($t3) {
1885 glBindTexture GL_TEXTURE_2D, $t3->{name};
1886 glBegin GL_QUADS;
1887 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1888 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1889 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1890 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1891 glEnd;
1892 }
1725 1893
1726 glDisable GL_BLEND; 1894 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1728} 1896}
1729 1897
… …
1735 1903
1736sub new { 1904sub new {
1737 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1738 1906
1739 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1908 tooltip => $arg{type},
1909 can_hover => 1,
1910 can_events => 1,
1741 %arg, 1911 %arg,
1742 ); 1912 );
1743 1913
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1914 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1915 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1916 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1917
1748 $self 1918 $self
1749} 1919}
1750 1920
1751sub set_fontsize { 1921sub set_fontsize {
… …
1753 1923
1754 $self->{value}->set_fontsize ($fsize); 1924 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1925 $self->{max} ->set_fontsize ($fsize);
1756} 1926}
1757 1927
1928sub set_max {
1929 my ($self, $max) = @_;
1930
1931 $self->{gauge}->set_max ($max);
1932 $self->{max}->set_text ($max);
1933}
1934
1758sub set_value { 1935sub set_value {
1759 my ($self, $val, $max) = @_; 1936 my ($self, $val, $max) = @_;
1760 1937
1761 $self->set_max ($max) 1938 $self->set_max ($max)
1762 if defined $max; 1939 if defined $max;
1763 1940
1764 $self->{gauge}->set_value ($val, $max); 1941 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1942 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 1943}
1774 1944
1775############################################################################# 1945#############################################################################
1776 1946
1777package CFClient::UI::Slider; 1947package CFClient::UI::Slider;
… …
1796 # TODO: calculations are off 1966 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 1967 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 1969 active_fg => [0, 0, 0],
1800 range => [0, 0, 100, 10], 1970 range => [0, 0, 100, 10],
1801 req_w => 20, 1971 req_w => $::WIDTH / 80,
1802 req_h => 20, 1972 req_h => $::WIDTH / 80,
1803 vertical => 0, 1973 vertical => 0,
1804 can_hover => 1, 1974 can_hover => 1,
1805 inner_pad => 5, 1975 inner_pad => 5,
1806 @_ 1976 @_
1807 ); 1977 );
… …
1890 $page ||= 2; 2060 $page ||= 2;
1891 2061
1892 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894 2064
1895 glEnable GL_BLEND;
1896 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2067
1900 # draw background 2068 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1902 2070
1903 # draw handle 2071 # draw handle
1904 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1905 2073
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
1908} 2075}
1909 2076
1910############################################################################# 2077#############################################################################
1911 2078
… …
1917 2084
1918sub new { 2085sub new {
1919 my $class = shift; 2086 my $class = shift;
1920 2087
1921 my $self = $class->SUPER::new ( 2088 my $self = $class->SUPER::new (
1922 fontsize => 1, 2089 fontsize => 1,
2090 can_events => 0,
1923 #font => default_font 2091 #font => default_font
1924 @_, 2092 @_,
1925 2093
1926 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
1927 par => [], 2095 par => [],
1928 height => 0, 2096 height => 0,
1929 children => [ 2097 children => [
1930 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
1932 ], 2100 ],
1933 ); 2101 );
1934 2102
1935 $self->{children}[1]->connect (changed => sub { 2103 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2104
1939 $self 2105 $self
1940} 2106}
1941 2107
1942sub set_fontsize { 2108sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2116 my ($self, $text) = @_;
1951 2117
1952 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
1953 2119
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2121 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2122 $layout->set_markup ($text);
1957 2123
1958 ($layout->size)[1] 2124 ($layout->size)[1]
1959} 2125}
1960 2126
1961sub reflow { 2127sub reflow {
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2180
2015 delete $self->{texture}; 2181 delete $self->{texture};
2016 } 2182 }
2017 2183
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019 glClearColor 0, 0, 0, 1; 2185 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2021 2187
2022 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 2190
2027 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2028 2192
… …
2037 2201
2038 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2203 my $h = $par->[0];
2040 2204
2041 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2042 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2043 2208
2044 glColor @{ $par->[1] };
2045 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2046 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2047 } 2211 }
2048 2212
2049 $y += $h; 2213 $y += $h;
2050 } 2214 }
2051 2215
2052 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND;
2054 }; 2217 };
2055 }); 2218 });
2056} 2219}
2057 2220
2058sub _draw { 2221sub _draw {
2059 my ($self) = @_; 2222 my ($self) = @_;
2060 2223
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2066 }
2067 2229
2068 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2069 2231
2070} 2232}
2071 2233
… …
2119 2281
2120sub new { 2282sub new {
2121 my $class = shift; 2283 my $class = shift;
2122 2284
2123 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2124 state => 0, 2286 state => 0,
2125 connect_activate => \&toggle_flopper, 2287 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2288 @_
2128 ); 2289 );
2129 2290
2130 if ($self->{state}) { 2291 if ($self->{state}) {
2131 $self->{state} = 0; 2292 $self->{state} = 0;
… …
2166 @_, 2327 @_,
2167 can_events => 0, 2328 can_events => 0,
2168 ) 2329 )
2169} 2330}
2170 2331
2171sub set_text { 2332sub set_tooltip_from {
2172 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2173 2334
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2175 $self->{label}->set_text ($text); 2336 markup => $widget->{tooltip},
2176 $self->add ($self->{label}); 2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8,
2339 fg => [0, 0, 0, 1],
2340 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 );
2177} 2342}
2178 2343
2179sub size_request { 2344sub size_request {
2180 my ($self) = @_; 2345 my ($self) = @_;
2181 2346
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2348
2186 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2187} 2350}
2188 2351
2352sub size_allocate {
2353 my ($self, $w, $h) = @_;
2354
2355 $self->SUPER::size_allocate ($w - 4, $h - 4);
2356}
2357
2189sub _draw { 2358sub _draw {
2190 my ($self) = @_; 2359 my ($self) = @_;
2191 2360
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2194 2362
2195 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2196 2364
2197 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2208 glVertex 0 , $h; 2376 glVertex 0 , $h;
2209 glVertex $w, $h; 2377 glVertex $w, $h;
2210 glVertex $w, 0; 2378 glVertex $w, 0;
2211 glEnd; 2379 glEnd;
2212 2380
2213 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2214
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2217} 2383}
2218 2384
2219############################################################################# 2385#############################################################################
2220 2386
2387package CFClient::UI::Face;
2388
2389our @ISA = CFClient::UI::Base::;
2390
2391use CFClient::OpenGL;
2392
2393sub new {
2394 my $class = shift;
2395
2396 $class->SUPER::new (
2397 aspect => 1,
2398 @_,
2399 )
2400}
2401
2402sub size_request {
2403 (32, 8)
2404}
2405
2406sub _draw {
2407 my ($self) = @_;
2408
2409 return unless $::CONN;#d# manage and cache textures differently
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411
2412 # TODO animation
2413 if ($tex) {
2414 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D;
2419 }
2420}
2421
2422#############################################################################
2423
2424package CFClient::UI::InventoryItem;
2425
2426our @ISA = CFClient::UI::HBox::;
2427
2428sub new {
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_;
2507
2508 $self->{scrolled}->clear;
2509 return unless $items;
2510
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Menu;
2534
2535our @ISA = CFClient::UI::FancyFrame::;
2536
2537use CFClient::OpenGL;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 items => [],
2544 z => 100,
2545 @_,
2546 );
2547
2548 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2549
2550 for my $item (@{ $self->{items} }) {
2551 my ($widget, $cb) = @$item;
2552
2553 # handle various types of items, only text for now
2554 if (!ref $widget) {
2555 $widget = new CFClient::UI::Label
2556 can_hover => 1,
2557 can_events => 1,
2558 text => $widget;
2559 }
2560
2561 $self->{item}{$widget} = $item;
2562
2563 $self->{vbox}->add ($widget);
2564 }
2565
2566 $self
2567}
2568
2569# popup given the event (must be a mouse button down event currently)
2570sub popup {
2571 my ($self, $ev) = @_;
2572
2573 $self->emit ("popdown");
2574
2575 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self;
2577 $self->{button} = $ev->{button};
2578
2579 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581}
2582
2583sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_;
2585
2586 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER};
2589}
2590
2591sub button_up {
2592 my ($self, $ev, $x, $y) = @_;
2593
2594 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB;
2596 $self->hide;
2597
2598 $self->emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover};
2600 }
2601}
2602
2603#############################################################################
2604
2605package CFClient::UI::Statusbox;
2606
2607our @ISA = CFClient::UI::VBox::;
2608
2609sub reorder {
2610 my ($self) = @_;
2611 my $NOW = time;
2612
2613 while (my ($k, $v) = each %{ $self->{item} }) {
2614 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2615 }
2616
2617 my @widgets;
2618
2619 my @items = sort {
2620 $a->{pri} <=> $b->{pri}
2621 or $b->{id} <=> $a->{id}
2622 } values %{ $self->{item} };
2623
2624 my $count = 10 + 1;
2625 for my $item (@items) {
2626 last unless --$count;
2627
2628 push @widgets, $item->{label} ||= do {
2629 # TODO: doesn't handle markup well (read as: at all)
2630 my $short = $item->{count} > 1
2631 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text};
2633
2634 for ($short) {
2635 s/^\s+//;
2636 s/\012.*/…/s;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 }
2640
2641 new CFClient::UI::Label
2642 markup => $short,
2643 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize},
2647 color => $item->{color},
2648 can_events => 1,
2649 can_hover => 1
2650 };
2651 }
2652
2653 $self->clear;
2654 $self->SUPER::add (reverse @widgets);
2655}
2656
2657sub add {
2658 my ($self, $text, %arg) = @_;
2659
2660 my $timeout = time + ((delete $arg{timeout}) || 60);
2661
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663
2664 if (my $item = $self->{item}{$group}) {
2665 if ($item->{text} eq $text) {
2666 $item->{count}++;
2667 } else {
2668 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text;
2670 }
2671 $item->{timeout} = $timeout;
2672 delete $item->{label};
2673 } else {
2674 $self->{item}{$group} = {
2675 id => ++$self->{id},
2676 text => $text,
2677 timeout => $timeout,
2678 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0,
2682 count => 1,
2683 %arg,
2684 };
2685 }
2686
2687 $self->reorder;
2688}
2689
2690#############################################################################
2691
2221package CFClient::UI::Root; 2692package CFClient::UI::Root;
2222 2693
2223our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2224 2695
2225use CFClient::OpenGL; 2696use CFClient::OpenGL;
2226 2697
2227sub check_size { 2698sub new {
2228 my ($self) = @_; 2699 my $class = shift;
2229 2700
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2701 $class->SUPER::new (
2231} 2702 @_,
2232 2703 )
2233sub size_request {
2234 ($::WIDTH, $::HEIGHT)
2235} 2704}
2236 2705
2237sub configure { 2706sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2707 my ($self, $x, $y, $w, $h) = @_;
2239 2708
2240 $self->SUPER::configure ($x, $y, $w, $h); 2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2241 2712
2713sub check_size {
2714 my ($self) = @_;
2715
2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2718}
2719
2720sub size_request {
2721 my ($self) = @_;
2722
2723 ($self->{w}, $self->{h})
2724}
2725
2726sub size_allocate {
2727 my ($self, $w, $h) = @_;
2728
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2242 for my $child (@{$self->{children}}) { 2745 for my $child ($self->children) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244 2747
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247 $child->configure ($X, $Y, $W,$H); 2750 $child->configure ($X, $Y, $W, $H);
2248 } 2751 }
2249}
2250 2752
2251sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2252 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2253 2759
2254 ($x, $y) 2760 ($x, $y)
2255} 2761}
2256 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2257sub update { 2769sub update {
2258 my ($self) = @_; 2770 my ($self) = @_;
2259 2771
2260 $self->check_size; 2772 $self->check_size;
2261 ::refresh (); 2773 $::WANT_REFRESH++;
2262} 2774}
2263 2775
2264sub add { 2776sub add {
2265 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2266 2778
2267 # integerize window positions 2779 # integerise window positions
2268 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2270 2782
2271 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2272} 2784}
… …
2275 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2276 2788
2277 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2278} 2790}
2279 2791
2280sub draw { 2792sub draw {
2281 my ($self) = @_; 2793 my ($self) = @_;
2282 2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839
2283 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2284 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2285 } 2843 }
2286 2844
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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