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.147 by root, Sat Apr 22 03:50:25 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 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
718sub size_allocate {
719 my ($self, $w, $h) = @_;
720
721 $self->update;
722}
723
724sub set_offset {
725 my ($self, $x, $y) = @_;
726
727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
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
771package CFClient::UI::ScrolledWindow;
772
773our @ISA = CFClient::UI::HBox::;
774
775sub new {
776 my $class = shift;
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
788 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort),
790 slider => $slider,
791 @_,
792 );
793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
798 $self
799}
800
801#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll
803
804#############################################################################
805
806package CFClient::UI::Frame;
807
808our @ISA = CFClient::UI::Bin::;
809
810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
819}
820
572sub _draw { 821sub _draw {
573 my ($self) = @_; 822 my ($self) = @_;
574 823
575 $self->{children}[1]->draw; 824 if ($self->{bg}) {
576} 825 my ($w, $h) = @$self{qw(w h)};
577 826
827 glEnable GL_BLEND;
828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
829 glColor @{ $self->{bg} };
578 830
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS; 831 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0; 832 glVertex 0 , 0;
613 glVertex 0 , $h + 4; 833 glVertex 0 , $h;
614 glVertex $w + 4 , $h + 4; 834 glVertex $w, $h;
615 glVertex $w + 4 , 0; 835 glVertex $w, 0;
616 glEnd; 836 glEnd;
617 837
618 $chld->draw; 838 glDisable GL_BLEND;
839 }
840
841 $self->SUPER::_draw;
619} 842}
620 843
621############################################################################# 844#############################################################################
622 845
623package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
634 my $class = shift; 857 my $class = shift;
635 858
636 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
637 860
638 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
641 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
866 can_events => 1,
642 @_ 867 @_
643 ); 868 );
644 869
645 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 871 align => 0,
647 valign => 1, 872 valign => 1,
648 text => $self->{title}, 873 text => $self->{title},
649 fontsize => 1; 874 fontsize => $self->{border};
650 875
651 $self 876 $self
652} 877}
653 878
654sub border { 879sub border {
655 int $_[0]{border} * $::FONTSIZE 880 int $_[0]{border} * $::FONTSIZE
656} 881}
657 882
658sub size_request { 883sub size_request {
659 my ($self) = @_; 884 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 885
663 my ($w, $h) = $self->SUPER::size_request; 886 my ($w, $h) = $self->SUPER::size_request;
664 887
665 ( 888 (
666 $w + $self->border * 2, 889 $w + $self->border * 2,
… …
681} 904}
682 905
683sub button_down { 906sub button_down {
684 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
685 908
909 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 910 my $border = $self->border;
687 911
688 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
693 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
694 $self->{motion} = sub { 923 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
696 925
697 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
698 928
699 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
701 $self->check_size; 932 $self->check_size;
702 }; 933 };
703 934
704 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
709 938
710 $self->{motion} = sub { 939 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
734 my ($self) = @_; 963 my ($self) = @_;
735 964
736 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
738 967
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 970
744 my $border = $self->border; 971 my $border = $self->border;
745 972
746 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
751 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
752 my $bg = $tex[0]; 980 my $bg = $tex[0];
753 981
754 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
756 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
757 985
758 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
759 987
760 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
764 993
765 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 995
768 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
769 $self->child->draw; 998 $self->child->draw;
770} 999}
771 1000
772############################################################################# 1001#############################################################################
773 1002
… …
795 $self->{children}[$y][$x] = $child; 1024 $self->{children}[$y][$x] = $child;
796 1025
797 $child->check_size; 1026 $child->check_size;
798} 1027}
799 1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
800# 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?
801sub clear { 1034sub clear {
802 my ($self) = @_; 1035 my ($self) = @_;
803 1036
1037 my @children = $self->children;
804 delete $self->{children}; 1038 delete $self->{children};
1039
1040 for (@children) {
1041 delete $_->{parent};
1042 $_->hide;
1043 }
1044
805 $self->update; 1045 $self->update;
806} 1046}
807 1047
808sub get_wh { 1048sub get_wh {
809 my ($self) = @_; 1049 my ($self) = @_;
… …
815 or next; 1055 or next;
816 1056
817 for my $x (0 .. $#$row) { 1057 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1058 my $widget = $row->[$x]
819 or next; 1059 or next;
820 my ($w, $h) = $widget->size_request; 1060 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1061
822 $w[$x] = max $w[$x], $w; 1062 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1063 $h[$y] = max $h[$y], $h;
824 } 1064 }
825 } 1065 }
… …
930 1170
931 ($h, $w) = ($w, $h); 1171 ($h, $w) = ($w, $h);
932 1172
933 my $children = $self->{children}; 1173 my $children = $self->{children};
934 1174
935 my @h = map +($_->size_request)[0], @$children; 1175 my @h = map $_->{req_w}, @$children;
936 1176
937 my $req_h = List::Util::sum @h; 1177 my $req_h = List::Util::sum @h;
938 1178
939 if ($req_h > $h) { 1179 if ($req_h > $h) {
940 # ah well, not enough space 1180 # ah well, not enough space
… …
986} 1226}
987 1227
988sub size_allocate { 1228sub size_allocate {
989 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
990 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
991 my $children = $self->{children}; 1233 my $children = $self->{children};
992 1234
993 my @h = map +($_->size_request)[1], @$children; 1235 my @h = map $_->{req_h}, @$children;
994 1236
995 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
996 1238
997 if ($req_h > $h) { 1239 if ($req_h > $h) {
998 # ah well, not enough space 1240 # ah well, not enough space
… …
1032 1274
1033sub new { 1275sub new {
1034 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1035 1277
1036 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1037 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),
1038 fontsize => 1, 1284 fontsize => 1,
1039 text => "",
1040 align => -1, 1285 align => -1,
1041 valign => -1, 1286 valign => -1,
1042 padding => 2, 1287 padding => 2,
1043 layout => new CFClient::Layout, 1288 can_events => 0,
1044 %arg 1289 %arg
1045 ); 1290 );
1046 1291
1047 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1295 $self->{template} = $layout;
1051 } 1296 }
1052 1297
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1054 $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 }
1055 1303
1056 $self 1304 $self
1057} 1305}
1058 1306
1059sub escape_text { 1307sub escape {
1060 local $_ = $_[1]; 1308 local $_ = $_[1];
1061 1309
1062 s/&/&amp;/g; 1310 s/&/&amp;/g;
1063 s/>/&gt;/g; 1311 s/>/&gt;/g;
1064 s/</&lt;/g; 1312 s/</&lt;/g;
1065 1313
1066 $_[1] 1314 $_[1]
1067} 1315}
1068 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
1069sub set_text { 1324sub set_text {
1070 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1071 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;
1072 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1073 1332
1074 delete $self->{texture};
1075 $self->update; 1333 $self->update;
1334 $self->check_size;
1076} 1335}
1077 1336
1078sub set_markup { 1337sub set_markup {
1079 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1080 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;
1081 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1082 1347
1083 delete $self->{texture};
1084 $self->update; 1348 $self->update;
1349 $self->check_size;
1085} 1350}
1086 1351
1087sub size_request { 1352sub size_request {
1088 my ($self) = @_; 1353 my ($self) = @_;
1089 1354
1090 $self->{layout}->set_width; 1355 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1358
1093 my ($w, $h) = $self->{layout}->size; 1359 my ($w, $h) = $self->{layout}->size;
1094 1360
1095 if (exists $self->{template}) { 1361 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1364
1098 my ($w2, $h2) = $self->{template}->size; 1365 my ($w2, $h2) = $self->{template}->size;
1099 1366
1100 $w = List::Util::max $w, $w2; 1367 $w = List::Util::max $w, $w2;
… …
1115 1382
1116sub set_fontsize { 1383sub set_fontsize {
1117 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1118 1385
1119 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1387 delete $self->{texture};
1388
1389 $self->update;
1120 $self->check_size; 1390 $self->check_size;
1121} 1391}
1122 1392
1123sub _draw { 1393sub _draw {
1124 my ($self) = @_; 1394 my ($self) = @_;
1125 1395
1126 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};
1127 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1128 $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
1129 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
1130 }; 1413 };
1131 1414
1132 glEnable GL_BLEND;
1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1134 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1136 1417
1418 if ($tex->{format} == GL_ALPHA) {
1137 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1138
1139 $self->{ox} = int (
1140 $self->{align} < 0 ? $self->{padding}
1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
1144
1145 $self->{oy} = int (
1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $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 }
1152 1424
1153 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1154 glDisable GL_BLEND;
1155} 1426}
1156 1427
1157############################################################################# 1428#############################################################################
1158 1429
1159package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1164 1435
1165sub new { 1436sub new {
1166 my $class = shift; 1437 my $class = shift;
1167 1438
1168 $class->SUPER::new ( 1439 $class->SUPER::new (
1169 fg => [1, 1, 1], 1440 fg => [1, 1, 1],
1170 bg => [0, 0, 0, 0.2], 1441 bg => [0, 0, 0, 0.2],
1171 active_bg => [1, 1, 1, 0.5], 1442 active_bg => [1, 1, 1, 0.5],
1172 active_fg => [0, 0, 0], 1443 active_fg => [0, 0, 0],
1173 can_hover => 1, 1444 can_hover => 1,
1174 can_focus => 1, 1445 can_focus => 1,
1175 valign => 0, 1446 valign => 0,
1447 can_events => 1,
1176 @_ 1448 @_
1177 ) 1449 )
1178} 1450}
1179 1451
1180sub _set_text { 1452sub _set_text {
… …
1193 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1194 1466
1195 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1196} 1468}
1197 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
1198sub get_text { 1479sub get_text {
1199 $_[0]{text} 1480 $_[0]{text}
1200} 1481}
1201 1482
1202sub size_request { 1483sub size_request {
… …
1208} 1489}
1209 1490
1210sub size_allocate { 1491sub size_allocate {
1211 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1212 1493
1213 $self->_set_text ($self->{text}); 1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1214}
1215
1216sub set_text {
1217 my ($self, $text) = @_;
1218
1219 $self->{cursor} = length $text;
1220 $self->_set_text ($text);
1221 $self->update;
1222} 1495}
1223 1496
1224sub key_down { 1497sub key_down {
1225 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1226 1499
… …
1228 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1229 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1230 1503
1231 my $text = $self->get_text; 1504 my $text = $self->get_text;
1232 1505
1233 if ($sym == 8) { 1506 if ($uni == 8) {
1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1235 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1236 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1237 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1238 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1239 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1240 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1241 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1242 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1243 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1244 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1246 $self->emit ('escape'); 1519 $self->emit ('escape');
1247 } elsif ($uni) { 1520 } elsif ($uni) {
1248 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1249 } 1522 }
1250 1523
… …
1333 my ($self, $ev) = @_; 1606 my ($self, $ev) = @_;
1334 1607
1335 my $sym = $ev->{sym}; 1608 my $sym = $ev->{sym};
1336 1609
1337 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} = '';
1338 $self->emit (activate => $self->get_text); 1615 $self->emit (activate => $txt);
1339 $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 }
1340 1639
1341 } else { 1640 } else {
1342 $self->SUPER::key_down ($ev); 1641 $self->SUPER::key_down ($ev);
1343 } 1642 }
1344 1643
… …
1358 1657
1359sub new { 1658sub new {
1360 my $class = shift; 1659 my $class = shift;
1361 1660
1362 $class->SUPER::new ( 1661 $class->SUPER::new (
1363 padding => 4, 1662 padding => 4,
1364 fg => [1, 1, 1], 1663 fg => [1, 1, 1],
1365 bg => [1, 1, 1, 0.2], 1664 bg => [1, 1, 1, 0.2],
1366 active_fg => [0, 0, 1], 1665 active_fg => [0, 0, 1],
1367 can_hover => 1, 1666 can_hover => 1,
1368 align => 0, 1667 align => 0,
1369 valign => 0, 1668 valign => 0,
1669 can_events => 1,
1370 @_ 1670 @_
1371 ) 1671 )
1372} 1672}
1373 1673
1374sub button_up { 1674sub button_up {
… …
1387 1687
1388 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1389 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1390 } 1690 }
1391 1691
1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1397 1695
1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1399 1697
1400 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402 1699
1403 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1404} 1701}
1405 1702
1406############################################################################# 1703#############################################################################
… …
1453 1750
1454 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;
1455 1752
1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1457 1754
1458 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1459 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1461
1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468} 1760}
1469 1761
1470############################################################################# 1762#############################################################################
1471 1763
1472package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1479our %loaded_images; 1771our %loaded_images;
1480 1772
1481sub new { 1773sub new {
1482 my $class = shift; 1774 my $class = shift;
1483 1775
1484 my $self = $class->SUPER::new (@_); 1776 my $self = $class->SUPER::new (can_events => 0, @_);
1485 1777
1486 $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!";
1487 1779
1488 $loaded_images{$self->{image}} ||= 1780 $loaded_images{$self->{image}} ||=
1489 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;
… …
1515 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1516 1808
1517 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1518 } 1810 }
1519 1811
1520 glEnable GL_BLEND;
1521 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1522 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1524 1814
1525 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1526 1816
1527 glDisable GL_BLEND;
1528 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1529} 1818}
1530 1819
1531############################################################################# 1820#############################################################################
1532 1821
1533package CFClient::UI::VGauge; 1822package CFClient::UI::VGauge;
1534 1823
1535our @ISA = CFClient::UI::Base::; 1824our @ISA = CFClient::UI::Base::;
1825
1826use List::Util qw(min max);
1536 1827
1537use CFClient::OpenGL; 1828use CFClient::OpenGL;
1538 1829
1539my %tex = ( 1830my %tex = (
1540 food => [ 1831 food => [
1541 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1542 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1833 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1543 ], 1834 ],
1544 grace => [ 1835 grace => [
1545 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1546 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/
1547 ], 1838 ],
1548 hp => [ 1839 hp => [
1549 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1550 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1841 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1551 ], 1842 ],
1552 mana => [ 1843 mana => [
1553 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1844 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1554 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/
1555 ], 1846 ],
1556); 1847);
1557 1848
1558# eg. VGauge->new (gauge => 'food'), default gauge: food 1849# eg. VGauge->new (gauge => 'food'), default gauge: food
1559sub new { 1850sub new {
… …
1578} 1869}
1579 1870
1580sub set_max { 1871sub set_max {
1581 my ($self, $max) = @_; 1872 my ($self, $max) = @_;
1582 1873
1874 return if $self->{max_val} == $max;
1875
1583 $self->{max_val} = $max; 1876 $self->{max_val} = $max;
1877 $self->update;
1584} 1878}
1585 1879
1586sub set_value { 1880sub set_value {
1587 my ($self, $val, $max) = @_; 1881 my ($self, $val, $max) = @_;
1588 1882
1589 $self->set_max ($max) 1883 $self->set_max ($max)
1590 if defined $max; 1884 if defined $max;
1591 1885
1592 $max = $self->{max_val}; 1886 return if $self->{val} == $val;
1887
1593 $self->{val} = $val; 1888 $self->{val} = $val;
1594
1595 $self->update; 1889 $self->update;
1596} 1890}
1597 1891
1598sub _draw { 1892sub _draw {
1599 my ($self) = @_; 1893 my ($self) = @_;
1600 1894
1601 my $tex = $tex{$self->{type}}; 1895 my $tex = $tex{$self->{type}};
1896 my ($t1, $t2, $t3) = @$tex;
1602 1897
1603 my ($w, $h) = ($self->{w}, $self->{h}); 1898 my ($w, $h) = ($self->{w}, $self->{h});
1604 1899
1605 if ($self->{vertical}) { 1900 if ($self->{vertical}) {
1606 glRotate 90, 0, 0, 1; 1901 glRotate 90, 0, 0, 1;
… …
1608 1903
1609 ($w, $h) = ($h, $w); 1904 ($w, $h) = ($h, $w);
1610 } 1905 }
1611 1906
1612 my $ycut = $self->{val} / ($self->{max_val} || 1); 1907 my $ycut = $self->{val} / ($self->{max_val} || 1);
1613 $ycut = 1 if $self->{val} > $self->{max_val};
1614 1908
1615 my $t1 = $tex->[0]; 1909 my $ycut1 = max 0, min 1, $ycut;
1616 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);
1617 1914
1618 glEnable GL_BLEND; 1915 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1916 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1620 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1622 1919
1623 my $h1 = $self->{h} - $ycut * $self->{h};
1624 my $h2 = $ycut * $self->{h};
1625
1626 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1920 glBindTexture GL_TEXTURE_2D, $t1->{name};
1627 glBegin GL_QUADS; 1921 glBegin GL_QUADS;
1628 glTexCoord 0 , 0; glVertex 0 , 0; 1922 glTexCoord 0 , 0; glVertex 0 , 0;
1629 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1923 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1630 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1924 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1631 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1925 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1632 glEnd; 1926 glEnd;
1633 1927
1928 my $ycut1 = List::Util::min 1, $ycut;
1634 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1929 glBindTexture GL_TEXTURE_2D, $t2->{name};
1635 glBegin GL_QUADS; 1930 glBegin GL_QUADS;
1636 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1931 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1637 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1932 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1638 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1933 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1639 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1934 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1640 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 }
1641 1946
1642 glDisable GL_BLEND; 1947 glDisable GL_BLEND;
1643 glDisable GL_TEXTURE_2D; 1948 glDisable GL_TEXTURE_2D;
1644} 1949}
1645 1950
… …
1648package CFClient::UI::Gauge; 1953package CFClient::UI::Gauge;
1649 1954
1650our @ISA = CFClient::UI::VBox::; 1955our @ISA = CFClient::UI::VBox::;
1651 1956
1652sub new { 1957sub new {
1653 my ($class, %arg) = shift; 1958 my ($class, %arg) = @_;
1654 1959
1655 my $self = $class->SUPER::new ( 1960 my $self = $class->SUPER::new (
1656 @_, 1961 tooltip => $arg{type},
1962 can_hover => 1,
1963 can_events => 1,
1964 %arg,
1657 ); 1965 );
1658 1966
1659 $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");
1660 $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);
1661 $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");
1662 1970
1663 $self 1971 $self
1664} 1972}
1665 1973
1666sub set_fontsize { 1974sub set_fontsize {
… …
1668 1976
1669 $self->{value}->set_fontsize ($fsize); 1977 $self->{value}->set_fontsize ($fsize);
1670 $self->{max} ->set_fontsize ($fsize); 1978 $self->{max} ->set_fontsize ($fsize);
1671} 1979}
1672 1980
1981sub set_max {
1982 my ($self, $max) = @_;
1983
1984 $self->{gauge}->set_max ($max);
1985 $self->{max}->set_text ($max);
1986}
1987
1673sub set_value { 1988sub set_value {
1674 my ($self, $val, $max) = @_; 1989 my ($self, $val, $max) = @_;
1675 1990
1676 $self->set_max ($max) 1991 $self->set_max ($max)
1677 if defined $max; 1992 if defined $max;
1678 1993
1679 $self->{gauge}->set_value ($val, $max); 1994 $self->{gauge}->set_value ($val, $max);
1680 $self->{value}->set_text ($val); 1995 $self->{value}->set_text ($val);
1681}
1682
1683sub set_max {
1684 my ($self, $max) = @_;
1685
1686 $self->{gauge}->set_max ($max);
1687 $self->{max}->set_text ($max);
1688} 1996}
1689 1997
1690############################################################################# 1998#############################################################################
1691 1999
1692package CFClient::UI::Slider; 2000package CFClient::UI::Slider;
… …
1702 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1703 2011
1704sub new { 2012sub new {
1705 my $class = shift; 2013 my $class = shift;
1706 2014
1707 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
1708 2016
1709 # TODO: 0-width page 2017 # TODO: 0-width page
1710 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
1711 # TODO: calculations are off 2019 # TODO: calculations are off
1712 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1713 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1714 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1715 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1716 req_w => 20, 2024 req_w => $::WIDTH / 80,
1717 req_h => 20, 2025 req_h => $::WIDTH / 80,
1718 vertical => 0, 2026 vertical => 0,
1719 can_hover => 1, 2027 can_hover => 1,
1720 inner_pad => 5, 2028 inner_pad => .05,
1721 @_ 2029 @_
1722 ); 2030 );
1723 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
1724 $self 2035 $self
2036}
2037
2038sub set_value {
2039 my ($self, $value) = @_;
2040
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042
2043 $hi = $lo + 1 if $hi <= $lo;
2044
2045 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi;
2047
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054
2055 if ($value != $old_value) {
2056 $self->emit (changed => $value);
2057 $self->update;
2058 }
1725} 2059}
1726 2060
1727sub size_request { 2061sub size_request {
1728 my ($self) = @_; 2062 my ($self) = @_;
1729 2063
… …
1742 2076
1743sub mouse_motion { 2077sub mouse_motion {
1744 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
1745 2079
1746 if ($GRAB == $self) { 2080 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082
2083 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2086
2087 $self->set_value ($x * ($hi - $lo) + $lo);
2088 }
2089}
2090
2091sub update {
2092 my ($self) = @_;
2093
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]);
2096
1747 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
1748 2098
1749 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
1750 2100
1751 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1752 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1753 2102
1754 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1755 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
1756 $x = $lo if $x < $lo;
1757 $x = $hi - $page if $x > $hi - $page;
1758 $self->{range}[0] = $x;
1759 2105
1760 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
1761 $self->update; 2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value;
2112 $self->{knob_w} = $page;
1762 } 2113 });
1763}
1764 2114
1765# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
1766# so that the handle doesn't leave the texture. This calculation isn't 100%
1767# correct propably, but it does the job for now
1768sub _calc_inner_pad_px {
1769 my ($self, $w) = @_;
1770 ($w / 100) * $self->{inner_pad} # % to pixels
1771} 2116}
1772 2117
1773sub _draw { 2118sub _draw {
1774 my ($self) = @_; 2119 my ($self) = @_;
1775 2120
1776 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
1777 2122
1778 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
1779 2124
1780 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
1781 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
1782 2127
1783 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
1784 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
1785
1786 ($w, $h) = ($h, $w);
1787 } 2130 }
1788 2131
1789 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1790 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1791 2134
1792 my ($value, $lo, $hi, $page) = @{$self->{range}};
1793
1794 $hi = $value + 1 if $lo == $hi;
1795
1796 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1797 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1798
1799 $page = int $page * $inner_w / ($hi - $lo);
1800 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1801
1802 $w -= $page;
1803 $page &= ~1;
1804 glTranslate $page * 0.5, 0, 0;
1805 $page ||= 2;
1806
1807 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1808 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814 2137
1815 # draw background 2138 # draw background
1816 $tex[1]->draw_quad (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1817 2140
1818 # draw handle 2141 # draw handle
1819 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1820 2143
1821 glDisable GL_BLEND;
1822 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
1823} 2145}
1824 2146
1825############################################################################# 2147#############################################################################
1826 2148
… …
1832 2154
1833sub new { 2155sub new {
1834 my $class = shift; 2156 my $class = shift;
1835 2157
1836 my $self = $class->SUPER::new ( 2158 my $self = $class->SUPER::new (
1837 fontsize => 1, 2159 fontsize => 1,
2160 can_events => 0,
2161 #font => default_font
1838 @_, 2162 @_,
1839 2163
1840 layout => (new CFClient::Layout), 2164 layout => (new CFClient::Layout 1),
1841 par => [], 2165 par => [],
1842 height => 0, 2166 height => 0,
1843 children => [ 2167 children => [
1844 (new CFClient::UI::Empty expand => 1), 2168 (new CFClient::UI::Empty expand => 1),
1845 (new CFClient::UI::Slider vertical => 1), 2169 (new CFClient::UI::Slider vertical => 1),
1846 ], 2170 ],
1847 ); 2171 );
1848 2172
1849 $self->{children}[1]->connect (changed => sub { 2173 $self->{children}[1]->connect (changed => sub { $self->update });
1850 $self->update;
1851 });
1852 2174
1853 $self 2175 $self
1854} 2176}
1855 2177
1856sub set_fontsize { 2178sub set_fontsize {
… …
1864 my ($self, $text) = @_; 2186 my ($self, $text) = @_;
1865 2187
1866 my $layout = $self->{layout}; 2188 my $layout = $self->{layout};
1867 2189
1868 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1869 $layout->set_width ($self->{w}); 2191 $layout->set_width ($self->{children}[0]{w});
1870 $layout->set_text ($text); 2192 $layout->set_markup ($text);
1871 2193
1872 ($layout->size)[1] 2194 ($layout->size)[1]
1873} 2195}
1874 2196
1875sub reflow { 2197sub reflow {
… …
1882sub size_allocate { 2204sub size_allocate {
1883 my ($self, $w, $h) = @_; 2205 my ($self, $w, $h) = @_;
1884 2206
1885 $self->SUPER::size_allocate ($w, $h); 2207 $self->SUPER::size_allocate ($w, $h);
1886 2208
2209 $self->{layout}->set_font ($self->{font}) if $self->{font};
1887 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1888 $self->{layout}->set_width ($self->{children}[0]{w}); 2211 $self->{layout}->set_width ($self->{children}[0]{w});
1889 2212
1890 $self->reflow; 2213 $self->reflow;
1891} 2214}
… …
1912 2235
1913 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
1914 2237
1915 delete $self->{texture}; 2238 delete $self->{texture};
1916 2239
1917 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
1918 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
1919 my $height = 0; 2242 my $height = 0;
1920 2243
1921 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
1922 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
1926 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1927 2250
1928 delete $self->{texture}; 2251 delete $self->{texture};
1929 } 2252 }
1930 2253
1931 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1932 glClearColor 0, 0, 0, 1; 2255 glClearColor 0, 0, 0, 0;
1933 glClear GL_COLOR_BUFFER_BIT; 2256 glClear GL_COLOR_BUFFER_BIT;
1934 2257
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2258 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2260
1940 my $top = int $self->{children}[1]{range}[0]; 2261 my $top = int $self->{children}[1]{range}[0];
1941 2262
… …
1944 2265
1945 my $y = 0; 2266 my $y = 0;
1946 2267
1947 my $layout = $self->{layout}; 2268 my $layout = $self->{layout};
1948 2269
2270 $layout->set_font ($self->{font}) if $self->{font};
2271
1949 for my $par (@{$self->{par}}) { 2272 for my $par (@{$self->{par}}) {
1950 my $h = $par->[0]; 2273 my $h = $par->[0];
1951 2274
1952 if ($y0 < $y + $h && $y < $y1) { 2275 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
1953 $layout->set_text ($par->[2]); 2277 $layout->set_markup ($par->[2]);
1954 2278
1955 glColor @{ $par->[1] };
1956 my ($W, $H) = $layout->size; 2279 my ($W, $H) = $layout->size;
1957 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1958 } 2281 }
1959 2282
1960 $y += $h; 2283 $y += $h;
1961 } 2284 }
1962 2285
1963 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
1964 glDisable GL_BLEND;
1965 }; 2287 };
1966 }); 2288 });
1967} 2289}
1968 2290
1969sub _draw { 2291sub _draw {
1970 my ($self) = @_; 2292 my ($self) = @_;
1971 2293
1972 if ($self->{texture}) {
1973 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1975 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2296 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1976 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
1977 }
1978 2299
1979 $self->{children}[1]->draw; 2300 $self->{children}[1]->draw;
1980 2301
1981} 2302}
1982 2303
… …
2030 2351
2031sub new { 2352sub new {
2032 my $class = shift; 2353 my $class = shift;
2033 2354
2034 my $self = $class->SUPER::new ( 2355 my $self = $class->SUPER::new (
2035 state => 0, 2356 state => 0,
2036 connect_activate => \&toggle_flopper, 2357 connect_activate => \&toggle_flopper,
2037 @_ 2358 @_
2038 ); 2359 );
2039 2360
2040 if ($self->{state}) { 2361 if ($self->{state}) {
… …
2061 $self->emit (changed => $self->{state}); 2382 $self->emit (changed => $self->{state});
2062} 2383}
2063 2384
2064############################################################################# 2385#############################################################################
2065 2386
2387package CFClient::UI::Tooltip;
2388
2389our @ISA = CFClient::UI::Bin::;
2390
2391use CFClient::OpenGL;
2392
2393sub new {
2394 my $class = shift;
2395
2396 $class->SUPER::new (
2397 @_,
2398 can_events => 0,
2399 )
2400}
2401
2402sub set_tooltip_from {
2403 my ($self, $widget) = @_;
2404
2405 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8,
2409 fg => [0, 0, 0, 1],
2410 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 );
2412}
2413
2414sub size_request {
2415 my ($self) = @_;
2416
2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2418
2419 ($w + 4, $h + 4)
2420}
2421
2422sub size_allocate {
2423 my ($self, $w, $h) = @_;
2424
2425 $self->SUPER::size_allocate ($w - 4, $h - 4);
2426}
2427
2428sub _draw {
2429 my ($self) = @_;
2430
2431 glTranslate 0.375, 0.375;
2432
2433 my ($w, $h) = @$self{qw(w h)};
2434
2435 glColor 1, 0.8, 0.4;
2436 glBegin GL_QUADS;
2437 glVertex 0 , 0;
2438 glVertex 0 , $h;
2439 glVertex $w, $h;
2440 glVertex $w, 0;
2441 glEnd;
2442
2443 glColor 0, 0, 0;
2444 glBegin GL_LINE_LOOP;
2445 glVertex 0 , 0;
2446 glVertex 0 , $h;
2447 glVertex $w, $h;
2448 glVertex $w, 0;
2449 glEnd;
2450
2451 glTranslate 2 - 0.375, 2 - 0.375;
2452 $self->SUPER::_draw;
2453}
2454
2455#############################################################################
2456
2457package CFClient::UI::Face;
2458
2459our @ISA = CFClient::UI::Base::;
2460
2461use CFClient::OpenGL;
2462
2463sub new {
2464 my $class = shift;
2465
2466 $class->SUPER::new (
2467 aspect => 1,
2468 @_,
2469 )
2470}
2471
2472sub size_request {
2473 (32, 8)
2474}
2475
2476sub _draw {
2477 my ($self) = @_;
2478
2479 return unless $::CONN;#d# manage and cache textures differently
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2481
2482 # TODO animation
2483 if ($tex) {
2484 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D;
2489 }
2490}
2491
2492#############################################################################
2493
2494package CFClient::UI::InventoryItem;
2495
2496our @ISA = CFClient::UI::HBox::;
2497
2498sub new {
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2523
2524 my $self = $class->SUPER::new (
2525 can_hover => 1,
2526 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_;
2531
2532 # todo: maybe put examine on 1? but should just be a tooltip :(
2533 if ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) {
2538 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ],
2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 }
2551
2552 1
2553 },
2554 %args
2555 );
2556
2557 $self->add (new CFClient::UI::Face
2558 can_events => 0,
2559 face => $item->{face},
2560 anim => $item->{anim},
2561 animspeed => $item->{animspeed},
2562 );
2563
2564 $self->add (new CFClient::UI::Label
2565 can_events => 0,
2566 text => $desc,
2567 );
2568
2569 $self
2570}
2571
2572#############################################################################
2573
2574package CFClient::UI::Inventory;
2575
2576our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox),
2583 @_,
2584 );
2585
2586 $self
2587}
2588
2589sub set_items {
2590 my ($self, $items) = @_;
2591
2592 $self->{scrolled}->clear;
2593 return unless $items;
2594
2595 my @items = sort {
2596 ($a->{type} <=> $b->{type})
2597 or ($a->{name} cmp $b->{name})
2598 } @$items;
2599
2600 $self->{real_items} = \@items;
2601
2602 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2608 }
2609
2610 $self->{scrolled}->add (@items);
2611
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613}
2614
2615sub size_request {
2616 my ($self) = @_;
2617 ($self->{req_w}, $self->{req_h});
2618}
2619
2620#############################################################################
2621
2622package CFClient::UI::Menu;
2623
2624our @ISA = CFClient::UI::FancyFrame::;
2625
2626use CFClient::OpenGL;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 items => [],
2633 z => 100,
2634 @_,
2635 );
2636
2637 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2638
2639 for my $item (@{ $self->{items} }) {
2640 my ($widget, $cb) = @$item;
2641
2642 # handle various types of items, only text for now
2643 if (!ref $widget) {
2644 $widget = new CFClient::UI::Label
2645 can_hover => 1,
2646 can_events => 1,
2647 text => $widget;
2648 }
2649
2650 $self->{item}{$widget} = $item;
2651
2652 $self->{vbox}->add ($widget);
2653 }
2654
2655 $self
2656}
2657
2658# popup given the event (must be a mouse button down event currently)
2659sub popup {
2660 my ($self, $ev) = @_;
2661
2662 $self->emit ("popdown");
2663
2664 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self;
2666 $self->{button} = $ev->{button};
2667
2668 $self->show;
2669 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2670}
2671
2672sub mouse_motion {
2673 my ($self, $ev, $x, $y) = @_;
2674
2675 # TODO: should use vbox->find_widget or so
2676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2677 $self->{hover} = $self->{item}{$HOVER};
2678}
2679
2680sub button_up {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB;
2685 $self->hide;
2686
2687 $self->emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover};
2689 }
2690}
2691
2692#############################################################################
2693
2694package CFClient::UI::Statusbox;
2695
2696our @ISA = CFClient::UI::VBox::;
2697
2698sub reorder {
2699 my ($self) = @_;
2700 my $NOW = time;
2701
2702 while (my ($k, $v) = each %{ $self->{item} }) {
2703 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2704 }
2705
2706 my @widgets;
2707
2708 my @items = sort {
2709 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} };
2712
2713 my $count = 10 + 1;
2714 for my $item (@items) {
2715 last unless --$count;
2716
2717 push @widgets, $item->{label} ||= do {
2718 # TODO: doesn't handle markup well (read as: at all)
2719 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text};
2722
2723 for ($short) {
2724 s/^\s+//;
2725 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 }
2729
2730 new CFClient::UI::Label
2731 markup => $short,
2732 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize},
2736 fg => $item->{fg},
2737 can_events => 1,
2738 can_hover => 1
2739 };
2740 }
2741
2742 $self->clear;
2743 $self->SUPER::add (reverse @widgets);
2744}
2745
2746sub add {
2747 my ($self, $text, %arg) = @_;
2748
2749 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//;
2751
2752 my $timeout = time + ((delete $arg{timeout}) || 60);
2753
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755
2756 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) {
2758 $item->{count}++;
2759 } else {
2760 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text;
2762 }
2763 $item->{id} = ++$self->{id};
2764 $item->{timeout} = $timeout;
2765 delete $item->{label};
2766 } else {
2767 $self->{item}{$group} = {
2768 id => ++$self->{id},
2769 text => $text,
2770 timeout => $timeout,
2771 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0,
2775 count => 1,
2776 %arg,
2777 };
2778 }
2779
2780 $self->reorder;
2781}
2782
2783#############################################################################
2784
2066package CFClient::UI::Root; 2785package CFClient::UI::Root;
2067 2786
2068our @ISA = CFClient::UI::Container::; 2787our @ISA = CFClient::UI::Container::;
2069 2788
2070use CFClient::OpenGL; 2789use CFClient::OpenGL;
2071 2790
2072sub check_size { 2791sub new {
2073 my ($self) = @_; 2792 my $class = shift;
2074 2793
2075 $self->configure (0, 0, $::WITH, $::HEIGHT); 2794 $class->SUPER::new (
2076} 2795 @_,
2077 2796 )
2078sub size_request {
2079 ($::WIDTH, $::HEIGHT)
2080} 2797}
2081 2798
2082sub configure { 2799sub configure {
2083 my ($self, $x, $y, $w, $h) = @_; 2800 my ($self, $x, $y, $w, $h) = @_;
2084 2801
2085 $self->SUPER::configure ($x, $y, $w, $h); 2802 $self->{w} = $w;
2086 2803 $self->{h} = $h;
2087 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2088 for @{$self->{children}};
2089} 2804}
2090 2805
2091sub _topleft { 2806sub check_size {
2807 my ($self) = @_;
2808
2809 $self->size_allocate ($self->{w}, $self->{h})
2810 if $self->{w};
2811}
2812
2813sub size_request {
2814 my ($self) = @_;
2815
2816 ($self->{w}, $self->{h})
2817}
2818
2819sub size_allocate {
2820 my ($self, $w, $h) = @_;
2821
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2828 for my $child ($self->children) {
2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x};
2833
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835 if exists $child->{req_y};
2836
2837 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2838 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839
2840 $child->configure ($X, $Y, $W, $H);
2841 }
2842}
2843
2844sub coord2local {
2092 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
2093 2846
2094 ($x, $y) 2847 ($x, $y)
2095} 2848}
2096 2849
2850sub coord2global {
2851 my ($self, $x, $y) = @_;
2852
2853 ($x, $y)
2854}
2855
2097sub update { 2856sub update {
2098 my ($self) = @_; 2857 my ($self) = @_;
2099 2858
2100 $self->check_size; 2859 $self->check_size;
2101 ::refresh (); 2860 $::WANT_REFRESH++;
2102} 2861}
2103 2862
2104sub add { 2863sub add {
2105 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
2106 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2107 # integerize window positions 2869 # integerise window positions
2108 $child->{x} = int $child->{x}; 2870 $child->{x} = int $child->{x};
2109 $child->{y} = int $child->{y}; 2871 $child->{y} = int $child->{y};
2872 }
2110 2873
2111 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
2112} 2875}
2113 2876
2114sub on_refresh { 2877sub on_refresh {
2115 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
2116 2879
2117 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
2118} 2881}
2119 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
2120sub draw { 2889sub draw {
2121 my ($self) = @_; 2890 my ($self) = @_;
2122 2891
2123 while (my $rcb = delete $self->{refresh_hook}) { 2892 while ($self->{refresh_hook}) {
2124 $_->() for values %$rcb; 2893 $_->()
2894 for values %{delete $self->{refresh_hook}};
2895 }
2896
2897 if ($self->{check_size}) {
2898 my @queue = ([], []);
2899
2900 for (;;) {
2901 if ($self->{check_size}) {
2902 # heuristic: check containers last
2903 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2904 for values %{delete $self->{check_size}}
2905 }
2906
2907 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2908
2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2910 ? @$widget{qw(user_w user_h)}
2911 : $widget->size_request;
2912
2913 if (delete $widget->{force_alloc}
2914 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2916
2917 $widget->{req_w} = $w;
2918 $widget->{req_h} = $h;
2919
2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2921
2922 $widget->{parent}->check_size
2923 if $widget->{parent};
2924 }
2925 }
2926 }
2927
2928 while ($self->{size_alloc}) {
2929 for (values %{delete $self->{size_alloc}}) {
2930 my ($widget, $w, $h) = @$_;
2931
2932 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0;
2934
2935 $widget->{w} = $w;
2936 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h);
2938 $widget->emit (size_allocate => $w, $h);
2939 }
2940 }
2941
2942 while ($self->{post_alloc_hook}) {
2943 $_->()
2944 for values %{delete $self->{post_alloc_hook}};
2125 } 2945 }
2126 2946
2127 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2128 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2129 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;
… …
2140############################################################################# 2960#############################################################################
2141 2961
2142package CFClient::UI; 2962package CFClient::UI;
2143 2963
2144$ROOT = new CFClient::UI::Root; 2964$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip;
2145 2966
21461 29671
2147 2968

Diff Legend

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