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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.205 by root, Mon May 15 00:15:08 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines