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.153 by root, Sun Apr 23 02:14:33 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;
24
25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
23 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $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;
26 } 41 }
27 42
28 return; 43 return;
29 } 44 }
30 } 45 }
… …
34 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
35} 50}
36 51
37# class methods for events 52# class methods for events
38sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
40} 56}
41 57
42sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
44} 61}
45 62
46sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
47 my ($ev) = @_; 64 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 73 check_tooltip;
57 } 74 }
58 75
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 77
61 $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 }
62} 82}
63 83
64sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
67 87
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 89
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 91
72 $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 }
73 96
74 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 99 $grab->update if $grab;
77 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 117
95 check_tooltip; 118 check_tooltip;
96 } 119 }
97 120
98 $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 }
99} 125}
100 126
101# convert position array to integers 127# convert position array to integers
102sub harmonize { 128sub harmonize {
103 my ($vals) = @_; 129 my ($vals) = @_;
… …
121 147
122sub new { 148sub new {
123 my $class = shift; 149 my $class = shift;
124 150
125 my $self = bless { 151 my $self = bless {
126 x => 0, 152 x => 0,
127 y => 0, 153 y => 0,
128 z => 0, 154 z => 0,
129 can_events => 1, 155 can_events => 1,
130 @_ 156 @_
131 }, $class; 157 }, $class;
132 158
133 for (keys %$self) { 159 for (keys %$self) {
… …
137 } 163 }
138 164
139 $self 165 $self
140} 166}
141 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
142sub show { 175sub show {
143 my ($self) = @_; 176 my ($self) = @_;
144 177
145 return if $self->{parent}; 178 return if $self->{parent};
146 179
… …
148} 181}
149 182
150sub hide { 183sub hide {
151 my ($self) = @_; 184 my ($self) = @_;
152 185
153 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
154 188
155 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
156} 191}
157 192
158sub move { 193sub move {
159 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
160 195
… …
163 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
164 199
165 $self->update; 200 $self->update;
166} 201}
167 202
168sub needs_redraw { 203sub set_size {
169 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
170} 210}
171 211
172sub size_request { 212sub size_request {
173 require Carp; 213 require Carp;
174 Carp::confess "size_request is abstract"; 214 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 234 $self->{y} = $y;
195 $self->update; 235 $self->update;
196 } 236 }
197 237
198 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 240 }
205} 241}
206 242
207sub size_allocate { 243sub size_allocate {
208 # nothing to be done 244 # nothing to be done
209} 245}
210 246
211# return top left coordinates 247sub children {
212sub _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;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
262sub set_max_size {
213 my ($self, $x, $y) = @_; 263 my ($self, $w, $h) = @_;
214 264
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
216} 267}
217 268
218# translate global coordinates to local coordinate system 269# translate global coordinates to local coordinate system
219sub coord2local { 270sub coord2local {
220 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
221 272
222 my ($X, $Y) = $self->_topleft; 273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 274}
225 275
226# translate local coordinates to global coordinate system 276# translate local coordinates to global coordinate system
227sub coord2global { 277sub coord2global {
228 my ($self, $x, $y) = @_; 278 my ($self, $x, $y) = @_;
229 279
230 my ($X, $Y) = $self->_topleft; 280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 281}
233 282
234sub focus_in { 283sub focus_in {
235 my ($self) = @_; 284 my ($self) = @_;
236 285
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 345 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 346 glVertex $x , $y + $self->{h};
298 glEnd; 347 glEnd;
299 glDisable GL_BLEND; 348 glDisable GL_BLEND;
300 } 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 }
301} 364}
302 365
303sub _draw { 366sub _draw {
304 my ($self) = @_; 367 my ($self) = @_;
305 368
… …
320 383
321sub set_parent { 384sub set_parent {
322 my ($self, $parent) = @_; 385 my ($self, $parent) = @_;
323 386
324 Scalar::Util::weaken ($self->{parent} = $parent); 387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
325} 391}
326 392
327sub check_size { 393sub check_size {
328 my ($self) = @_; 394 my ($self, $forced) = @_;
329 395
330 return unless $self->{parent}; 396 $self->{force_alloc} = 1 if $forced;
331 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 398}
341 399
342sub update { 400sub update {
343 my ($self) = @_; 401 my ($self) = @_;
344 402
… …
353} 411}
354 412
355sub emit { 413sub emit {
356 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
357 415
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 417}
362 418
363sub DESTROY { 419sub DESTROY {
364 my ($self) = @_; 420 my ($self) = @_;
365 421
… …
432sub new { 488sub new {
433 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
434 490
435 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
436 492
437 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 );
438 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
439 499
440 $self 500 $self
441} 501}
442 502
443sub add { 503sub add {
444 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
445 505
446 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
447 508
448 use sort 'stable'; 509 use sort 'stable';
449 510
450 $self->{children} = [ 511 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
453 ]; 514 ];
454 515
455 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
456} 522}
457 523
458sub remove { 524sub remove {
459 my ($self, $child) = @_; 525 my ($self, $child) = @_;
460 526
461 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
462 529
463 $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 }
464 546
465 $self->check_size; 547 $self->check_size;
466 $self->update; 548 $self->update;
467} 549}
468 550
… …
546} 628}
547 629
548sub update { 630sub update {
549 my ($self) = @_; 631 my ($self) = @_;
550 632
551 # we want to do this delayed... 633 $ROOT->on_refresh ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 634 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 635}
565 636
566sub size_allocate { 637sub size_allocate {
567 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
568 639
569 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
570 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
571 $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 };
572} 664}
573 665
574sub _draw { 666sub _draw {
575 my ($self) = @_; 667 my ($self) = @_;
576 668
577 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
578 670
579 my $tex = $self->{texture} 671 my $tex = $self->{texture}
580 or return; 672 or return;
581 673
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
585 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;
586 677
587 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 679
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
591} 681}
592 682
593############################################################################# 683#############################################################################
594 684
595package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
596 686
597our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
598 688
599sub new { die }
600
601sub size_request { 689sub size_request {
602 my ($self) = @_; 690 my ($self) = @_;
603 691
604 @$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)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
606 694
607 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
608} 696}
609 697
610sub _draw { 698sub size_allocate {
611 my ($self) = @_; 699 my ($self, $w, $h) = @_;
612 700
613 $self->{children}[1]->draw; 701 $self->update;
614} 702}
615 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
616 706
617############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
618 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
619package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
620 752
621our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
622
623use CFClient::OpenGL;
624 754
625sub new { 755sub new {
626 my $class = shift; 756 my $class = shift;
627 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
628 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
629 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
630 border_bg => [1, 1, 1, 1], 770 slider => $slider,
631 border => 0.8,
632 @_ 771 @_,
633 ); 772 );
634 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
635 $self 778 $self
636} 779}
637 780
638sub set_size { 781#TODO# update range on size_allocate depeneing on child
639 my ($self, $w, $h) = @_; 782# update viewport offset on scroll
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644 783
645sub size_request { 784#############################################################################
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649 785
650sub size_allocate { 786package CFClient::UI::Frame;
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655}
656 787
657sub _draw { 788our @ISA = CFClient::UI::Bin::;
658 my ($self) = @_;
659 789
660 my ($w, $h) = ($self->{w}, $self->{h}); 790use CFClient::OpenGL;
661
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666
667# glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0;
670# glVertex 0 , $h;
671# glVertex $w, $h;
672# glVertex $w, 0;
673# glEnd;
674
675
676 $self->child->draw;
677 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D;
679}
680 791
681############################################################################# 792#############################################################################
682 793
683package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
684 795
… …
694 my $class = shift; 805 my $class = shift;
695 806
696 # TODO: user_x, user_y, overwrite moveto? 807 # TODO: user_x, user_y, overwrite moveto?
697 808
698 my $self = $class->SUPER::new ( 809 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 810 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 811 border_bg => [1, 1, 1, 1],
701 border => 0.8, 812 border => 0.6,
702 can_events => 1, 813 can_events => 1,
703 @_ 814 @_
704 ); 815 );
705 816
706 $self->{title} &&= new CFClient::UI::Label 817 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 818 align => 0,
708 valign => 1, 819 valign => 1,
709 text => $self->{title}, 820 text => $self->{title},
710 fontsize => 1; 821 fontsize => $self->{border};
711 822
712 $self 823 $self
713} 824}
714 825
715sub border { 826sub border {
716 int $_[0]{border} * $::FONTSIZE 827 int $_[0]{border} * $::FONTSIZE
717} 828}
718 829
719sub size_request { 830sub size_request {
720 my ($self) = @_; 831 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 832
724 my ($w, $h) = $self->SUPER::size_request; 833 my ($w, $h) = $self->SUPER::size_request;
725 834
726 ( 835 (
727 $w + $self->border * 2, 836 $w + $self->border * 2,
… …
742} 851}
743 852
744sub button_down { 853sub button_down {
745 my ($self, $ev, $x, $y) = @_; 854 my ($self, $ev, $x, $y) = @_;
746 855
856 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 857 my $border = $self->border;
748 858
749 if ($x < $self->{w} && $x >= $self->{w} - $border 859 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 860 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 861
862 if ($lr & $td) {
863 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 865 my ($bw, $bh) = ($self->{w}, $self->{h});
754 866
867 my $mx = $x < $border;
868 my $my = $y < $border;
869
755 $self->{motion} = sub { 870 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 871 my ($ev, $x, $y) = @_;
757 872
758 ($x, $y) = ($ev->{x}, $ev->{y}); 873 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy;
759 875
760 $self->{user_w} = $bw + $x - $ox; 876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 879 $self->check_size;
763 }; 880 };
764 881
765 } elsif ($x >= 0 && $x < $self->{w} 882 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 883 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 884 my ($bx, $by) = ($self->{x}, $self->{y});
770 885
771 $self->{motion} = sub { 886 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 887 my ($ev, $x, $y) = @_;
… …
795 my ($self) = @_; 910 my ($self) = @_;
796 911
797 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799 914
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 917
805 my $border = $self->border; 918 my $border = $self->border;
806 919
807 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812 925
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 927 my $bg = $tex[0];
814 928
815 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 930 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 931 my $rep_y = $ch / $bg->{h};
818 932
819 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
820 934
821 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
825 940
826 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 942
829 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
944
830 $self->child->draw; 945 $self->child->draw;
831} 946}
832 947
833############################################################################# 948#############################################################################
834 949
… …
856 $self->{children}[$y][$x] = $child; 971 $self->{children}[$y][$x] = $child;
857 972
858 $child->check_size; 973 $child->check_size;
859} 974}
860 975
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
861# 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?
862sub clear { 981sub clear {
863 my ($self) = @_; 982 my ($self) = @_;
864 983
984 my @children = $self->children;
865 delete $self->{children}; 985 delete $self->{children};
986
987 for (@children) {
988 delete $_->{parent};
989 $_->hide;
990 }
991
866 $self->update; 992 $self->update;
867} 993}
868 994
869sub get_wh { 995sub get_wh {
870 my ($self) = @_; 996 my ($self) = @_;
… …
1047} 1173}
1048 1174
1049sub size_allocate { 1175sub size_allocate {
1050 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1051 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1052 my $children = $self->{children}; 1180 my $children = $self->{children};
1053 1181
1054 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1055 1183
1056 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1093 1221
1094sub new { 1222sub new {
1095 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1096 1224
1097 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1099 fontsize => 1, 1231 fontsize => 1,
1100 text => "",
1101 align => -1, 1232 align => -1,
1102 valign => -1, 1233 valign => -1,
1103 padding => 2, 1234 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1235 can_events => 0,
1106 %arg 1236 %arg
1107 ); 1237 );
1108 1238
1109 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1242 $self->{template} = $layout;
1113 } 1243 }
1114 1244
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1116 $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 }
1117 1250
1118 $self 1251 $self
1119} 1252}
1120 1253
1121sub escape_text { 1254sub escape {
1122 local $_ = $_[1]; 1255 local $_ = $_[1];
1123 1256
1124 s/&/&amp;/g; 1257 s/&/&amp;/g;
1125 s/>/&gt;/g; 1258 s/>/&gt;/g;
1126 s/</&lt;/g; 1259 s/</&lt;/g;
1127 1260
1128 $_[1] 1261 $_[1]
1129} 1262}
1130 1263
1264sub update {
1265 my ($self) = @_;
1266
1267 delete $self->{texture};
1268 $self->SUPER::update;
1269}
1270
1131sub set_text { 1271sub set_text {
1132 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1133 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;
1134 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1135 1279
1136 delete $self->{texture}; 1280 $self->update;
1137 $self->check_size; 1281 $self->check_size;
1138 $self->update;
1139} 1282}
1140 1283
1141sub set_markup { 1284sub set_markup {
1142 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1143 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;
1144 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1145 1294
1146 delete $self->{texture}; 1295 $self->update;
1147 $self->check_size; 1296 $self->check_size;
1148 $self->update;
1149} 1297}
1150 1298
1151sub size_request { 1299sub size_request {
1152 my ($self) = @_; 1300 my ($self) = @_;
1153 1301
1154 $self->{layout}->set_width; 1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1305
1157 my ($w, $h) = $self->{layout}->size; 1306 my ($w, $h) = $self->{layout}->size;
1158 1307
1159 if (exists $self->{template}) { 1308 if (exists $self->{template}) {
1309 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1310 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1311
1162 my ($w2, $h2) = $self->{template}->size; 1312 my ($w2, $h2) = $self->{template}->size;
1163 1313
1164 $w = List::Util::max $w, $w2; 1314 $w = List::Util::max $w, $w2;
… …
1180sub set_fontsize { 1330sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1331 my ($self, $fontsize) = @_;
1182 1332
1183 $self->{fontsize} = $fontsize; 1333 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1334 delete $self->{texture};
1335
1336 $self->update;
1185 $self->check_size; 1337 $self->check_size;
1186 $self->update;
1187} 1338}
1188 1339
1189sub _draw { 1340sub _draw {
1190 my ($self) = @_; 1341 my ($self) = @_;
1191 1342
1192 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1194 $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
1195 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
1196 }; 1360 };
1197 1361
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1200 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1202 1364
1365 if ($tex->{format} == GL_ALPHA) {
1203 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1204
1205 $self->{ox} = int (
1206 $self->{align} < 0 ? $self->{padding}
1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1210
1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $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 }
1218 1371
1219 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1220 glDisable GL_BLEND;
1221} 1373}
1222 1374
1223############################################################################# 1375#############################################################################
1224 1376
1225package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1230 1382
1231sub new { 1383sub new {
1232 my $class = shift; 1384 my $class = shift;
1233 1385
1234 $class->SUPER::new ( 1386 $class->SUPER::new (
1235 fg => [1, 1, 1], 1387 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1388 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1389 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1390 active_fg => [0, 0, 0],
1239 can_hover => 1, 1391 can_hover => 1,
1240 can_focus => 1, 1392 can_focus => 1,
1241 valign => 0, 1393 valign => 0,
1242 can_events => 1, 1394 can_events => 1,
1243 @_ 1395 @_
1244 ) 1396 )
1245} 1397}
1246 1398
… …
1260 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1261 1413
1262 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1263} 1415}
1264 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
1265sub get_text { 1426sub get_text {
1266 $_[0]{text} 1427 $_[0]{text}
1267} 1428}
1268 1429
1269sub size_request { 1430sub size_request {
… …
1276 1437
1277sub size_allocate { 1438sub size_allocate {
1278 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1279 1440
1280 $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
1281}
1282
1283sub set_text {
1284 my ($self, $text) = @_;
1285
1286 $self->{cursor} = length $text;
1287 $self->_set_text ($text);
1288 $self->update;
1289} 1442}
1290 1443
1291sub key_down { 1444sub key_down {
1292 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1293 1446
… …
1400 my ($self, $ev) = @_; 1553 my ($self, $ev) = @_;
1401 1554
1402 my $sym = $ev->{sym}; 1555 my $sym = $ev->{sym};
1403 1556
1404 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} = '';
1405 $self->emit (activate => $self->get_text); 1562 $self->emit (activate => $txt);
1406 $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 }
1407 1586
1408 } else { 1587 } else {
1409 $self->SUPER::key_down ($ev); 1588 $self->SUPER::key_down ($ev);
1410 } 1589 }
1411 1590
… …
1425 1604
1426sub new { 1605sub new {
1427 my $class = shift; 1606 my $class = shift;
1428 1607
1429 $class->SUPER::new ( 1608 $class->SUPER::new (
1430 padding => 4, 1609 padding => 4,
1431 fg => [1, 1, 1], 1610 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2], 1611 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1612 active_fg => [0, 0, 1],
1434 can_hover => 1, 1613 can_hover => 1,
1435 align => 0, 1614 align => 0,
1436 valign => 0, 1615 valign => 0,
1437 can_events => 1, 1616 can_events => 1,
1438 @_ 1617 @_
1439 ) 1618 )
1440} 1619}
1441 1620
… …
1455 1634
1456 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1457 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1458 } 1637 }
1459 1638
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1465 1642
1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1467 1644
1468 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1469 glDisable GL_BLEND;
1470 1646
1471 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1472} 1648}
1473 1649
1474############################################################################# 1650#############################################################################
… …
1521 1697
1522 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;
1523 1699
1524 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1525 1701
1526 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1527 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1529
1530 my $tex = $self->{state} ? $tex[1] : $tex[0];
1531
1532 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1533
1534 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536} 1707}
1537 1708
1538############################################################################# 1709#############################################################################
1539 1710
1540package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1583 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1584 1755
1585 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1586 } 1757 }
1587 1758
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 1761
1593 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1594 1763
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1597} 1765}
1598 1766
1599############################################################################# 1767#############################################################################
1600 1768
1601package CFClient::UI::VGauge; 1769package CFClient::UI::VGauge;
1602 1770
1603our @ISA = CFClient::UI::Base::; 1771our @ISA = CFClient::UI::Base::;
1772
1773use List::Util qw(min max);
1604 1774
1605use CFClient::OpenGL; 1775use CFClient::OpenGL;
1606 1776
1607my %tex = ( 1777my %tex = (
1608 food => [ 1778 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1779 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1780 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1781 ],
1612 grace => [ 1782 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1783 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 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/
1615 ], 1785 ],
1616 hp => [ 1786 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1787 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1788 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1789 ],
1620 mana => [ 1790 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1791 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 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/
1623 ], 1793 ],
1624); 1794);
1625 1795
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1796# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1797sub new {
… …
1646} 1816}
1647 1817
1648sub set_max { 1818sub set_max {
1649 my ($self, $max) = @_; 1819 my ($self, $max) = @_;
1650 1820
1821 return if $self->{max_val} == $max;
1822
1651 $self->{max_val} = $max; 1823 $self->{max_val} = $max;
1824 $self->update;
1652} 1825}
1653 1826
1654sub set_value { 1827sub set_value {
1655 my ($self, $val, $max) = @_; 1828 my ($self, $val, $max) = @_;
1656 1829
1657 $self->set_max ($max) 1830 $self->set_max ($max)
1658 if defined $max; 1831 if defined $max;
1659 1832
1660 $max = $self->{max_val}; 1833 return if $self->{val} == $val;
1834
1661 $self->{val} = $val; 1835 $self->{val} = $val;
1662
1663 $self->update; 1836 $self->update;
1664} 1837}
1665 1838
1666sub _draw { 1839sub _draw {
1667 my ($self) = @_; 1840 my ($self) = @_;
1668 1841
1669 my $tex = $tex{$self->{type}}; 1842 my $tex = $tex{$self->{type}};
1843 my ($t1, $t2, $t3) = @$tex;
1670 1844
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1845 my ($w, $h) = ($self->{w}, $self->{h});
1672 1846
1673 if ($self->{vertical}) { 1847 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1848 glRotate 90, 0, 0, 1;
… …
1676 1850
1677 ($w, $h) = ($h, $w); 1851 ($w, $h) = ($h, $w);
1678 } 1852 }
1679 1853
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1854 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1855
1683 my $t1 = $tex->[0]; 1856 my $ycut1 = max 0, min 1, $ycut;
1684 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);
1685 1861
1686 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1864 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1866
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1867 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1868 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1869 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1870 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1871 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1872 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1873 glEnd;
1701 1874
1875 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1876 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1877 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1878 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1879 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1880 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1881 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 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 }
1709 1893
1710 glDisable GL_BLEND; 1894 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1712} 1896}
1713 1897
… …
1719 1903
1720sub new { 1904sub new {
1721 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1722 1906
1723 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1908 tooltip => $arg{type},
1909 can_hover => 1,
1910 can_events => 1,
1725 %arg, 1911 %arg,
1726 ); 1912 );
1727 1913
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1914 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1915 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1916 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 1917
1732 $self 1918 $self
1733} 1919}
1734 1920
… …
1737 1923
1738 $self->{value}->set_fontsize ($fsize); 1924 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 1925 $self->{max} ->set_fontsize ($fsize);
1740} 1926}
1741 1927
1928sub set_max {
1929 my ($self, $max) = @_;
1930
1931 $self->{gauge}->set_max ($max);
1932 $self->{max}->set_text ($max);
1933}
1934
1742sub set_value { 1935sub set_value {
1743 my ($self, $val, $max) = @_; 1936 my ($self, $val, $max) = @_;
1744 1937
1745 $self->set_max ($max) 1938 $self->set_max ($max)
1746 if defined $max; 1939 if defined $max;
1747 1940
1748 $self->{gauge}->set_value ($val, $max); 1941 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 1942 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 1943}
1758 1944
1759############################################################################# 1945#############################################################################
1760 1946
1761package CFClient::UI::Slider; 1947package CFClient::UI::Slider;
… …
1780 # TODO: calculations are off 1966 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 1967 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 1969 active_fg => [0, 0, 0],
1784 range => [0, 0, 100, 10], 1970 range => [0, 0, 100, 10],
1785 req_w => 20, 1971 req_w => $::WIDTH / 80,
1786 req_h => 20, 1972 req_h => $::WIDTH / 80,
1787 vertical => 0, 1973 vertical => 0,
1788 can_hover => 1, 1974 can_hover => 1,
1789 inner_pad => 5, 1975 inner_pad => 5,
1790 @_ 1976 @_
1791 ); 1977 );
… …
1874 $page ||= 2; 2060 $page ||= 2;
1875 2061
1876 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1877 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1878 2064
1879 glEnable GL_BLEND;
1880 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1881 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
1882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1883 2067
1884 # draw background 2068 # draw background
1885 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1886 2070
1887 # draw handle 2071 # draw handle
1888 $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);
1889 2073
1890 glDisable GL_BLEND;
1891 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
1892} 2075}
1893 2076
1894############################################################################# 2077#############################################################################
1895 2078
… …
1901 2084
1902sub new { 2085sub new {
1903 my $class = shift; 2086 my $class = shift;
1904 2087
1905 my $self = $class->SUPER::new ( 2088 my $self = $class->SUPER::new (
1906 fontsize => 1, 2089 fontsize => 1,
2090 can_events => 0,
2091 #font => default_font
1907 @_, 2092 @_,
1908 2093
1909 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
1910 par => [], 2095 par => [],
1911 height => 0, 2096 height => 0,
1912 children => [ 2097 children => [
1913 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
1915 ], 2100 ],
1916 ); 2101 );
1917 2102
1918 $self->{children}[1]->connect (changed => sub { 2103 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2104
1922 $self 2105 $self
1923} 2106}
1924 2107
1925sub set_fontsize { 2108sub set_fontsize {
… …
1933 my ($self, $text) = @_; 2116 my ($self, $text) = @_;
1934 2117
1935 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
1936 2119
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2121 $layout->set_width ($self->{children}[0]{w});
1939 $layout->set_text ($text); 2122 $layout->set_markup ($text);
1940 2123
1941 ($layout->size)[1] 2124 ($layout->size)[1]
1942} 2125}
1943 2126
1944sub reflow { 2127sub reflow {
… …
1951sub size_allocate { 2134sub size_allocate {
1952 my ($self, $w, $h) = @_; 2135 my ($self, $w, $h) = @_;
1953 2136
1954 $self->SUPER::size_allocate ($w, $h); 2137 $self->SUPER::size_allocate ($w, $h);
1955 2138
2139 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2140 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2141 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2142
1959 $self->reflow; 2143 $self->reflow;
1960} 2144}
… …
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1996 2180
1997 delete $self->{texture}; 2181 delete $self->{texture};
1998 } 2182 }
1999 2183
2000 $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 {
2001 glClearColor 0, 0, 0, 1; 2185 glClearColor 0, 0, 0, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2003 2187
2004 glEnable GL_BLEND;
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2007 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2008 2190
2009 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2010 2192
… …
2013 2195
2014 my $y = 0; 2196 my $y = 0;
2015 2197
2016 my $layout = $self->{layout}; 2198 my $layout = $self->{layout};
2017 2199
2200 $layout->set_font ($self->{font}) if $self->{font};
2201
2018 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2203 my $h = $par->[0];
2020 2204
2021 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2022 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2023 2208
2024 glColor @{ $par->[1] };
2025 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2026 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);
2027 } 2211 }
2028 2212
2029 $y += $h; 2213 $y += $h;
2030 } 2214 }
2031 2215
2032 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2033 glDisable GL_BLEND;
2034 }; 2217 };
2035 }); 2218 });
2036} 2219}
2037 2220
2038sub _draw { 2221sub _draw {
2039 my ($self) = @_; 2222 my ($self) = @_;
2040 2223
2041 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 $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});
2045 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2046 }
2047 2229
2048 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2049 2231
2050} 2232}
2051 2233
… …
2099 2281
2100sub new { 2282sub new {
2101 my $class = shift; 2283 my $class = shift;
2102 2284
2103 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2104 state => 0, 2286 state => 0,
2105 connect_activate => \&toggle_flopper, 2287 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2288 @_
2108 ); 2289 );
2109 2290
2110 if ($self->{state}) { 2291 if ($self->{state}) {
2111 $self->{state} = 0; 2292 $self->{state} = 0;
… …
2146 @_, 2327 @_,
2147 can_events => 0, 2328 can_events => 0,
2148 ) 2329 )
2149} 2330}
2150 2331
2151sub set_text { 2332sub set_tooltip_from {
2152 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2153 2334
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8; 2335 $self->add (new CFClient::UI::Label
2155 $self->{label}->set_text ($text); 2336 markup => $widget->{tooltip},
2156 $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 );
2157} 2342}
2158 2343
2159sub size_request { 2344sub size_request {
2160 my ($self) = @_; 2345 my ($self) = @_;
2161 2346
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163 2348
2164 $w = List::Util::min $::WIDTH * 0.2, $w; 2349 ($w + 4, $h + 4)
2350}
2165 2351
2166 ($w, $h) 2352sub size_allocate {
2353 my ($self, $w, $h) = @_;
2354
2355 $self->SUPER::size_allocate ($w - 4, $h - 4);
2356}
2357
2358sub _draw {
2359 my ($self) = @_;
2360
2361 glTranslate 0.375, 0.375;
2362
2363 my ($w, $h) = @$self{qw(w h)};
2364
2365 glColor 1, 0.8, 0.4;
2366 glBegin GL_QUADS;
2367 glVertex 0 , 0;
2368 glVertex 0 , $h;
2369 glVertex $w, $h;
2370 glVertex $w, 0;
2371 glEnd;
2372
2373 glColor 0, 0, 0;
2374 glBegin GL_LINE_LOOP;
2375 glVertex 0 , 0;
2376 glVertex 0 , $h;
2377 glVertex $w, $h;
2378 glVertex $w, 0;
2379 glEnd;
2380
2381 glTranslate 2 - 0.375, 2 - 0.375;
2382 $self->SUPER::_draw;
2383}
2384
2385#############################################################################
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;
2167} 2688}
2168 2689
2169############################################################################# 2690#############################################################################
2170 2691
2171package CFClient::UI::Root; 2692package CFClient::UI::Root;
2172 2693
2173our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2174 2695
2175use CFClient::OpenGL; 2696use CFClient::OpenGL;
2176 2697
2177sub check_size { 2698sub new {
2178 my ($self) = @_; 2699 my $class = shift;
2179 2700
2180 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2701 $class->SUPER::new (
2181} 2702 @_,
2182 2703 )
2183sub size_request {
2184 ($::WIDTH, $::HEIGHT)
2185} 2704}
2186 2705
2187sub configure { 2706sub configure {
2188 my ($self, $x, $y, $w, $h) = @_; 2707 my ($self, $x, $y, $w, $h) = @_;
2189 2708
2190 $self->SUPER::configure ($x, $y, $w, $h); 2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2191 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
2192 for my $child (@{$self->{children}}) { 2745 for my $child ($self->children) {
2193 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)};
2194 2747
2195 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2196 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2197 $child->configure ($X, $Y, $W,$H); 2750 $child->configure ($X, $Y, $W, $H);
2198 } 2751 }
2199}
2200 2752
2201sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2202 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2203 2759
2204 ($x, $y) 2760 ($x, $y)
2205} 2761}
2206 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2207sub update { 2769sub update {
2208 my ($self) = @_; 2770 my ($self) = @_;
2209 2771
2210 $self->check_size; 2772 $self->check_size;
2211 ::refresh (); 2773 $::WANT_REFRESH++;
2212} 2774}
2213 2775
2214sub add { 2776sub add {
2215 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2216 2778
2217 # integerize window positions 2779 # integerise window positions
2218 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2219 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2220 2782
2221 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2222} 2784}
… …
2225 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2226 2788
2227 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2228} 2790}
2229 2791
2230sub draw { 2792sub draw {
2231 my ($self) = @_; 2793 my ($self) = @_;
2232 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
2233 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2234 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2235 } 2843 }
2236 2844
2237 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2238 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2239 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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