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.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 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
… …
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
17our %WIDGET; # all widgets, weak-referenced
18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
20 23
21 if ($TOOLTIP->{owner} != $widget) { 24 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 25 $TOOLTIP->{owner} = $widget;
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 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;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $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 }
67} 83}
68 84
69sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
70 my ($ev) = @_; 86 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
72 88
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 90
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 92
77 $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 }
78 97
79 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 100 $grab->update if $grab;
82 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 118
100 check_tooltip; 119 check_tooltip;
101 } 120 }
102 121
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 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 }
104} 126}
105 127
106# convert position array to integers 128# convert position array to integers
107sub harmonize { 129sub harmonize {
108 my ($vals) = @_; 130 my ($vals) = @_;
… …
114 $rem += $_ - $i; 136 $rem += $_ - $i;
115 $_ = $i; 137 $_ = $i;
116 } 138 }
117} 139}
118 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
119############################################################################# 161#############################################################################
120 162
121package CFClient::UI::Base; 163package CFClient::UI::Base;
122 164
123use strict; 165use strict;
… …
126 168
127sub new { 169sub new {
128 my $class = shift; 170 my $class = shift;
129 171
130 my $self = bless { 172 my $self = bless {
131 x => 0, 173 x => 0,
132 y => 0, 174 y => 0,
133 z => 0, 175 z => 0,
134 can_events => 1, 176 can_events => 1,
135 @_ 177 @_
136 }, $class; 178 }, $class;
137 179
138 for (keys %$self) { 180 for (keys %$self) {
139 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
141 } 183 }
142 } 184 }
143 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
144 $self 188 $self
145} 189}
146 190
191sub destroy {
192 my ($self) = @_;
193
194 $self->hide;
195 %$self = ();
196}
197
147sub show { 198sub show {
148 my ($self) = @_; 199 my ($self) = @_;
149 200
150 return if $self->{parent}; 201 return if $self->{parent};
151 202
… …
153} 204}
154 205
155sub hide { 206sub hide {
156 my ($self) = @_; 207 my ($self) = @_;
157 208
158 return unless $self->{parent}; 209 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self;
159 211
160 $self->{parent}->remove ($self); 212 $self->{parent}->remove ($self)
213 if $self->{parent};
161} 214}
162 215
163sub move { 216sub move {
164 my ($self, $x, $y, $z) = @_; 217 my ($self, $x, $y, $z) = @_;
165 218
… …
168 $self->{z} = $z if defined $z; 221 $self->{z} = $z if defined $z;
169 222
170 $self->update; 223 $self->update;
171} 224}
172 225
173sub needs_redraw { 226sub set_size {
174 0 227 my ($self, $w, $h) = @_;
228
229 $self->{user_w} = $w;
230 $self->{user_h} = $h;
231
232 $self->check_size;
175} 233}
176 234
177sub size_request { 235sub size_request {
178 require Carp; 236 require Carp;
179 Carp::confess "size_request is abstract"; 237 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 257 $self->{y} = $y;
200 $self->update; 258 $self->update;
201 } 259 }
202 260
203 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 263 }
210} 264}
211 265
212sub size_allocate { 266sub size_allocate {
213 # nothing to be done 267 # nothing to be done
214} 268}
215 269
216# return top left coordinates 270sub reconfigure {
217sub _topleft { 271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
280sub set_max_size {
218 my ($self, $x, $y) = @_; 281 my ($self, $w, $h) = @_;
219 282
220 $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;
285}
286
287sub set_tooltip {
288 my ($self, $tooltip) = @_;
289
290 $self->{tooltip} = $tooltip;
291
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
221} 296}
222 297
223# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
224sub coord2local { 299sub coord2local {
225 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
226 301
227 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 303}
230 304
231# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
232sub coord2global { 306sub coord2global {
233 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
234 308
235 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 310}
238 311
239sub focus_in { 312sub focus_in {
240 my ($self) = @_; 313 my ($self) = @_;
241 314
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 374 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 375 glVertex $x , $y + $self->{h};
303 glEnd; 376 glEnd;
304 glDisable GL_BLEND; 377 glDisable GL_BLEND;
305 } 378 }
379
380 if ($ENV{PCLIENT_DEBUG}) {
381 glPushMatrix;
382 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0;
386 glVertex $self->{w}, 0;
387 glVertex $self->{w}, $self->{h};
388 glVertex 0 , $self->{h};
389 glEnd;
390 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 }
306} 393}
307 394
308sub _draw { 395sub _draw {
309 my ($self) = @_; 396 my ($self) = @_;
310 397
… …
325 412
326sub set_parent { 413sub set_parent {
327 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
328 415
329 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
330} 421}
331 422
332sub check_size { 423sub check_size {
333 my ($self) = @_; 424 my ($self, $forced) = @_;
334 425
335 return unless $self->{parent}; 426 $self->{force_alloc} = 1 if $forced;
336 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345} 428}
346 429
347sub update { 430sub update {
348 my ($self) = @_; 431 my ($self) = @_;
349 432
… …
358} 441}
359 442
360sub emit { 443sub emit {
361 my ($self, $signal, @args) = @_; 444 my ($self, $signal, @args) = @_;
362 445
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 447}
367 448
368sub DESTROY { 449sub DESTROY {
369 my ($self) = @_; 450 my ($self) = @_;
370 451
452 delete $WIDGET{$self+0};
371 #$self->deactivate; 453 #$self->deactivate;
372} 454}
373 455
374############################################################################# 456#############################################################################
375 457
… …
384 my $class = shift; 466 my $class = shift;
385 467
386 # range [value, low, high, page] 468 # range [value, low, high, page]
387 469
388 $class->SUPER::new ( 470 $class->SUPER::new (
389 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
390 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
391 @_ 473 @_
392 ) 474 )
393} 475}
394 476
395sub _draw { 477sub _draw {
396 my ($self) = @_; 478 my ($self) = @_;
397 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
398 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
399 486
400 glEnable GL_BLEND; 487 glEnable GL_BLEND;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
403 490
404 glBegin GL_QUADS; 491 glBegin GL_QUADS;
405 glVertex 0 , 0; 492 glVertex 0 , 0;
406 glVertex 0 , $h; 493 glVertex 0 , $h;
407 glVertex $w, $h; 494 glVertex $w, $h;
408 glVertex $w, 0; 495 glVertex $w, 0;
409 glEnd; 496 glEnd;
410 497
411 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
412} 500}
413 501
414############################################################################# 502#############################################################################
415 503
416package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
437sub new { 525sub new {
438 my ($class, %arg) = @_; 526 my ($class, %arg) = @_;
439 527
440 my $children = delete $arg{children} || []; 528 my $children = delete $arg{children} || [];
441 529
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 530 my $self = $class->SUPER::new (
531 children => [],
532 can_events => 0,
533 %arg,
534 );
443 $self->add ($_) for @$children; 535 $self->add ($_) for @$children;
444 536
445 $self 537 $self
446} 538}
447 539
448sub add { 540sub add {
449 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
450 542
451 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
452 545
453 use sort 'stable'; 546 use sort 'stable';
454 547
455 $self->{children} = [ 548 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
458 ]; 551 ];
459 552
460 $child->check_size; 553 $self->check_size (1);
554 $self->update;
555}
556
557sub children {
558 @{ $_[0]{children} }
461} 559}
462 560
463sub remove { 561sub remove {
464 my ($self, $child) = @_; 562 my ($self, $child) = @_;
465 563
466 delete $child->{parent}; 564 delete $child->{parent};
565 $child->hide;
467 566
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568
569 $self->check_size;
570 $self->update;
571}
572
573sub clear {
574 my ($self) = @_;
575
576 my $children = delete $self->{children};
577 $self->{children} = [];
578
579 for (@$children) {
580 delete $_->{parent};
581 $_->hide;
582 }
469 583
470 $self->check_size; 584 $self->check_size;
471 $self->update; 585 $self->update;
472} 586}
473 587
… …
551} 665}
552 666
553sub update { 667sub update {
554 my ($self) = @_; 668 my ($self) = @_;
555 669
556 # we want to do this delayed... 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 671 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 672}
570 673
571sub size_allocate { 674sub size_allocate {
572 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
573 676
574 $self->child->configure (0, 0, $w, $h); 677 $self->SUPER::size_allocate ($w, $h);
678 $self->update;
679}
575 680
681sub _render {
682 $_[0]{children}[0]->draw;
683}
684
685sub render_child {
686 my ($self) = @_;
687
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT;
691
576 $self->render_chld; 692 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 };
577} 701}
578 702
579sub _draw { 703sub _draw {
580 my ($self) = @_; 704 my ($self) = @_;
581 705
582 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
583 707
584 my $tex = $self->{texture} 708 my $tex = $self->{texture}
585 or return; 709 or return;
586 710
587 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1;
591 714
592 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
593 716
594 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
596} 718}
597 719
598############################################################################# 720#############################################################################
599 721
600package CFClient::UI::ViewPort; 722package CFClient::UI::ViewPort;
601 723
602our @ISA = CFClient::UI::Window::; 724our @ISA = CFClient::UI::Window::;
603 725
604sub new { die }
605
606sub size_request { 726sub size_request {
607 my ($self) = @_; 727 my ($self) = @_;
608 728
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
611 731
612 @$self{qw(child_w child_h)} 732 @$self{qw(child_w child_h)}
613} 733}
614 734
615sub _draw { 735sub size_allocate {
616 my ($self) = @_; 736 my ($self, $w, $h) = @_;
617 737
618 $self->{children}[1]->draw; 738 $self->update;
619} 739}
620 740
741sub set_offset {
742 my ($self, $x, $y) = @_;
621 743
622############################################################################# 744 $self->{view_x} = int $x;
745 $self->{view_y} = int $y;
623 746
747 $self->update;
748}
749
750# hmm, this does not work for topleft of $self... but we should not ask for that
751sub coord2local {
752 my ($self, $x, $y) = @_;
753
754 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
755}
756
757sub coord2global {
758 my ($self, $x, $y) = @_;
759
760 $x = List::Util::min $self->{w}, $x - $self->{view_x};
761 $y = List::Util::min $self->{h}, $y - $self->{view_y};
762
763 $self->SUPER::coord2global ($x, $y)
764}
765
766sub find_widget {
767 my ($self, $x, $y) = @_;
768
769 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
770 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
771 ) {
772 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
773 } else {
774 $self->CFClient::UI::Base::find_widget ($x, $y)
775 }
776}
777
778sub _render {
779 my ($self) = @_;
780
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782
783 $self->SUPER::_render;
784}
785
786#############################################################################
787
624package CFClient::UI::Frame; 788package CFClient::UI::ScrolledWindow;
625 789
626our @ISA = CFClient::UI::Bin::; 790our @ISA = CFClient::UI::HBox::;
627
628use CFClient::OpenGL;
629 791
630sub new { 792sub new {
631 my $class = shift; 793 my $class = shift;
632 794
795 my $self;
796
797 my $slider = new CFClient::UI::Slider
798 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
802 },
803 ;
804
633 my $self = $class->SUPER::new ( 805 $self = $class->SUPER::new (
634 bg => [1, 1, 1, 1], 806 vp => (new CFClient::UI::ViewPort),
635 border_bg => [1, 1, 1, 1], 807 slider => $slider,
636 border => 0.8,
637 @_ 808 @_,
638 ); 809 );
639 810
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider});
814
640 $self 815 $self
641} 816}
642 817
643sub set_size { 818#TODO# update range on size_allocate depending on child
644 my ($self, $w, $h) = @_; 819# update viewport offset on scroll
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649 820
650sub size_request { 821#############################################################################
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654 822
655sub size_allocate { 823package CFClient::UI::Frame;
656 my ($self, $w, $h) = @_; 824
657 $self->{w} = $w; 825our @ISA = CFClient::UI::Bin::;
658 $self->{h} = $h; 826
659 $self->child->configure (0, 0, $w, $h); 827use CFClient::OpenGL;
828
829sub new {
830 my $class = shift;
831
832 $class->SUPER::new (
833 bg => undef,
834 @_,
835 )
660} 836}
661 837
662sub _draw { 838sub _draw {
663 my ($self) = @_; 839 my ($self) = @_;
664 840
665 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
666 843
667 glEnable GL_BLEND; 844 glEnable GL_BLEND;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
669 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671 847
672# glBegin GL_QUADS; 848 glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0; 849 glVertex 0 , 0;
675# glVertex 0 , $h; 850 glVertex 0 , $h;
676# glVertex $w, $h; 851 glVertex $w, $h;
677# glVertex $w, 0; 852 glVertex $w, 0;
678# glEnd; 853 glEnd;
679 854
680
681 $self->child->draw;
682 glDisable GL_BLEND; 855 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
684} 859}
685 860
686############################################################################# 861#############################################################################
687 862
688package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
699 my $class = shift; 874 my $class = shift;
700 875
701 # TODO: user_x, user_y, overwrite moveto? 876 # TODO: user_x, user_y, overwrite moveto?
702 877
703 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
706 border => 0.8, 881 border => 0.6,
882 toplevel => 1,
707 can_events => 1, 883 can_events => 1,
708 @_ 884 @_
709 ); 885 );
710 886
711 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 888 align => 0,
713 valign => 1, 889 valign => 1,
714 text => $self->{title}, 890 text => $self->{title},
715 fontsize => 1; 891 fontsize => $self->{border};
716 892
717 $self 893 $self
718} 894}
719 895
720sub border { 896sub border {
721 int $_[0]{border} * $::FONTSIZE 897 int $_[0]{border} * $::FONTSIZE
722} 898}
723 899
724sub size_request { 900sub size_request {
725 my ($self) = @_; 901 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 902
729 my ($w, $h) = $self->SUPER::size_request; 903 my ($w, $h) = $self->SUPER::size_request;
730 904
731 ( 905 (
732 $w + $self->border * 2, 906 $w + $self->border * 2,
… …
738 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
739 913
740 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
741 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
742 916
743 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
744 if $self->{title}; 918 if $self->{title};
745 919
746 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
747} 921}
748 922
749sub button_down { 923sub button_down {
750 my ($self, $ev, $x, $y) = @_; 924 my ($self, $ev, $x, $y) = @_;
751 925
926 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 927 my $border = $self->border;
753 928
754 if ($x < $self->{w} && $x >= $self->{w} - $border 929 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 930 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 931
932 if ($lr & $td) {
933 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 934 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 935 my ($bw, $bh) = ($self->{w}, $self->{h});
759 936
937 my $mx = $x < $border;
938 my $my = $y < $border;
939
760 $self->{motion} = sub { 940 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
762 942
763 ($x, $y) = ($ev->{x}, $ev->{y}); 943 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy;
764 945
765 $self->{user_w} = $bw + $x - $ox; 946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 949 $self->check_size;
768 }; 950 };
769 951
770 } elsif ($x >= 0 && $x < $self->{w} 952 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 953 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 954 my ($bx, $by) = ($self->{x}, $self->{y});
775 955
776 $self->{motion} = sub { 956 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 957 my ($ev, $x, $y) = @_;
… …
800 my ($self) = @_; 980 my ($self) = @_;
801 981
802 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
804 984
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 987
810 my $border = $self->border; 988 my $border = $self->border;
811 989
812 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
817 995
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 997 my $bg = $tex[0];
819 998
820 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1000 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 1001 my $rep_y = $ch / $bg->{h};
823 1002
824 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
825 1004
826 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
830 1010
831 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 1012
834 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1014
835 $self->child->draw; 1015 $self->child->draw;
836} 1016}
837 1017
838############################################################################# 1018#############################################################################
839 1019
… …
861 $self->{children}[$y][$x] = $child; 1041 $self->{children}[$y][$x] = $child;
862 1042
863 $child->check_size; 1043 $child->check_size;
864} 1044}
865 1045
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
866# TODO: move to container class maybe? send childs a signal on removal? 1050# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 1051sub clear {
868 my ($self) = @_; 1052 my ($self) = @_;
869 1053
1054 my @children = $self->children;
870 delete $self->{children}; 1055 delete $self->{children};
1056
1057 for (@children) {
1058 delete $_->{parent};
1059 $_->hide;
1060 }
1061
871 $self->update; 1062 $self->update;
872} 1063}
873 1064
874sub get_wh { 1065sub get_wh {
875 my ($self) = @_; 1066 my ($self) = @_;
… …
1052} 1243}
1053 1244
1054sub size_allocate { 1245sub size_allocate {
1055 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1056 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1057 my $children = $self->{children}; 1250 my $children = $self->{children};
1058 1251
1059 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1060 1253
1061 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1090 1283
1091############################################################################# 1284#############################################################################
1092 1285
1093package CFClient::UI::Label; 1286package CFClient::UI::Label;
1094 1287
1095our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1096 1289
1097use CFClient::OpenGL; 1290use CFClient::OpenGL;
1098 1291
1099sub new { 1292sub new {
1100 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1101 1294
1102 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1104 fontsize => 1, 1303 fontsize => 1,
1105 text => "",
1106 align => -1, 1304 align => -1,
1107 valign => -1, 1305 valign => -1,
1108 padding => 2, 1306 padding => 2,
1109 layout => new CFClient::Layout,
1110 can_events => 0, 1307 can_events => 0,
1111 %arg 1308 %arg
1112 ); 1309 );
1113 1310
1114 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1314 $self->{template} = $layout;
1118 } 1315 }
1119 1316
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1318 $self->set_markup (delete $self->{markup});
1319 } else {
1320 $self->set_text (delete $self->{text});
1321 }
1122 1322
1123 $self 1323 $self
1124} 1324}
1125 1325
1126sub escape_text { 1326sub escape($) {
1127 local $_ = $_[1]; 1327 local $_ = $_[0];
1128 1328
1129 s/&/&amp;/g; 1329 s/&/&amp;/g;
1130 s/>/&gt;/g; 1330 s/>/&gt;/g;
1131 s/</&lt;/g; 1331 s/</&lt;/g;
1132 1332
1133 $_[1] 1333 $_
1334}
1335
1336sub update {
1337 my ($self) = @_;
1338
1339 delete $self->{texture};
1340 $self->SUPER::update;
1134} 1341}
1135 1342
1136sub set_text { 1343sub set_text {
1137 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1138 1345
1346 return if $self->{text} eq "T$text";
1347 $self->{text} = "T$text";
1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1139 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1140 1351
1141 delete $self->{texture}; 1352 $self->update;
1142 $self->check_size; 1353 $self->check_size;
1143 $self->update;
1144} 1354}
1145 1355
1146sub set_markup { 1356sub set_markup {
1147 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1148 1358
1359 return if $self->{text} eq "M$markup";
1360 $self->{text} = "M$markup";
1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1149 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1150 1366
1151 delete $self->{texture}; 1367 $self->update;
1152 $self->check_size; 1368 $self->check_size;
1153 $self->update;
1154} 1369}
1155 1370
1156sub size_request { 1371sub size_request {
1157 my ($self) = @_; 1372 my ($self) = @_;
1158 1373
1159 $self->{layout}->set_width; 1374 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1377
1162 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1163 1379
1164 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1383
1167 my ($w2, $h2) = $self->{template}->size; 1384 my ($w2, $h2) = $self->{template}->size;
1168 1385
1169 $w = List::Util::max $w, $w2; 1386 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1402sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1187 1404
1188 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1190 $self->check_size; 1409 $self->check_size;
1191 $self->update;
1192} 1410}
1193 1411
1194sub _draw { 1412sub _draw {
1195 my ($self) = @_; 1413 my ($self) = @_;
1196 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1197 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1422
1200 new_from_layout CFClient::Texture $self->{layout} 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1427 : ($self->{w} - $tex->{w}) * 0.5);
1428
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1431 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1201 }; 1434 };
1202 1435
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1438
1439 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1209
1210 $self->{ox} = int (
1211 $self->{align} < 0 ? $self->{padding}
1212 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1213 : ($self->{w} - $tex->{w}) * 0.5
1214 );
1215
1216 $self->{oy} = int (
1217 $self->{valign} < 0 ? $self->{padding}
1218 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1219 : ($self->{h} - $tex->{h}) * 0.5
1220 );
1221
1222 $tex->draw_quad ($self->{ox}, $self->{oy}); 1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1223 1445
1224 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1447}
1227 1448
1228############################################################################# 1449#############################################################################
1229 1450
1230package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1235 1456
1236sub new { 1457sub new {
1237 my $class = shift; 1458 my $class = shift;
1238 1459
1239 $class->SUPER::new ( 1460 $class->SUPER::new (
1240 fg => [1, 1, 1], 1461 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1462 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1463 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1464 active_fg => [0, 0, 0],
1244 can_hover => 1, 1465 can_hover => 1,
1245 can_focus => 1, 1466 can_focus => 1,
1246 valign => 0, 1467 valign => 0,
1247 can_events => 1, 1468 can_events => 1,
1248 @_ 1469 @_
1249 ) 1470 )
1250} 1471}
1251 1472
… …
1265 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1266 1487
1267 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1268} 1489}
1269 1490
1270sub get_text {
1271 $_[0]{text}
1272}
1273
1274sub size_request {
1275 my ($self) = @_;
1276
1277 my ($w, $h) = $self->SUPER::size_request;
1278
1279 ($w + 1, $h) # add 1 for cursor
1280}
1281
1282sub size_allocate {
1283 my ($self, $w, $h) = @_;
1284
1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1286}
1287
1288sub set_text { 1491sub set_text {
1289 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1290 1493
1291 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1292 $self->_set_text ($text); 1495 $self->_set_text ($text);
1293 $self->update; 1496 $self->update;
1497 $self->check_size;
1498}
1499
1500sub get_text {
1501 $_[0]{text}
1502}
1503
1504sub size_request {
1505 my ($self) = @_;
1506
1507 my ($w, $h) = $self->SUPER::size_request;
1508
1509 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1294} 1516}
1295 1517
1296sub key_down { 1518sub key_down {
1297 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1298 1520
… …
1300 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1302 1524
1303 my $text = $self->get_text; 1525 my $text = $self->get_text;
1304 1526
1305 if ($sym == 8) { 1527 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1540 $self->emit ('escape');
1319 } elsif ($uni) { 1541 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1321 } 1543 }
1322 1544
1323 $self->_set_text ($text); 1545 $self->_set_text ($text);
1324 $self->update; 1546 $self->update;
1547 $self->check_size;
1325} 1548}
1326 1549
1327sub focus_in { 1550sub focus_in {
1328 my ($self) = @_; 1551 my ($self) = @_;
1329 1552
… …
1405 my ($self, $ev) = @_; 1628 my ($self, $ev) = @_;
1406 1629
1407 my $sym = $ev->{sym}; 1630 my $sym = $ev->{sym};
1408 1631
1409 if ($sym == 13) { 1632 if ($sym == 13) {
1633 unshift @{$self->{history}},
1634 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1637 $self->emit (activate => $txt);
1411 $self->update; 1638 $self->update;
1639
1640 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text;
1643 }
1644 if (@{$self->{history} || []} > 0) {
1645 $self->{history_pointer}++;
1646 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1647 $self->{history_pointer} = @{$self->{history} || []} - 1;
1648 }
1649 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1650 }
1651
1652 } elsif ($sym == CFClient::SDLK_DOWN) {
1653 $self->{history_pointer}--;
1654 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1655
1656 if ($self->{history_pointer} >= 0) {
1657 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1658 } else {
1659 $self->set_text ($self->{history_saveback});
1660 }
1412 1661
1413 } else { 1662 } else {
1414 $self->SUPER::key_down ($ev); 1663 $self->SUPER::key_down ($ev);
1415 } 1664 }
1416 1665
… …
1430 1679
1431sub new { 1680sub new {
1432 my $class = shift; 1681 my $class = shift;
1433 1682
1434 $class->SUPER::new ( 1683 $class->SUPER::new (
1435 padding => 4, 1684 padding => 4,
1436 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1439 can_hover => 1, 1687 can_hover => 1,
1440 align => 0, 1688 align => 0,
1441 valign => 0, 1689 valign => 0,
1442 can_events => 1, 1690 can_events => 1,
1443 @_ 1691 @_
1444 ) 1692 )
1445} 1693}
1446 1694
… …
1460 1708
1461 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1463 } 1711 }
1464 1712
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1470 1716
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1718
1473 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1720
1476 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1477} 1722}
1478 1723
1479############################################################################# 1724#############################################################################
… …
1493 1738
1494 $class->SUPER::new ( 1739 $class->SUPER::new (
1495 padding => 2, 1740 padding => 2,
1496 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1497 active_fg => [1, 1, 0], 1742 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5],
1498 state => 0, 1745 state => 0,
1499 can_hover => 1, 1746 can_hover => 1,
1500 @_ 1747 @_
1501 ) 1748 )
1502} 1749}
… …
1526 1773
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1528 1775
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1777
1531 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1532 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1534
1535 my $tex = $self->{state} ? $tex[1] : $tex[0];
1536
1537 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1783}
1542 1784
1543############################################################################# 1785#############################################################################
1544 1786
1545package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1589 1831
1590 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1591 } 1833 }
1592 1834
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 1837
1598 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 1839
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1602} 1841}
1603 1842
1604############################################################################# 1843#############################################################################
1605 1844
1606package CFClient::UI::VGauge; 1845package CFClient::UI::VGauge;
1607 1846
1608our @ISA = CFClient::UI::Base::; 1847our @ISA = CFClient::UI::Base::;
1848
1849use List::Util qw(min max);
1609 1850
1610use CFClient::OpenGL; 1851use CFClient::OpenGL;
1611 1852
1612my %tex = ( 1853my %tex = (
1613 food => [ 1854 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1855 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1856 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1857 ],
1617 grace => [ 1858 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1859 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1860 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1861 ],
1621 hp => [ 1862 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1863 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1864 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1865 ],
1625 mana => [ 1866 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1867 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1868 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1869 ],
1629); 1870);
1630 1871
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1872# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1873sub new {
… …
1651} 1892}
1652 1893
1653sub set_max { 1894sub set_max {
1654 my ($self, $max) = @_; 1895 my ($self, $max) = @_;
1655 1896
1897 return if $self->{max_val} == $max;
1898
1656 $self->{max_val} = $max; 1899 $self->{max_val} = $max;
1900 $self->update;
1657} 1901}
1658 1902
1659sub set_value { 1903sub set_value {
1660 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1661 1905
1662 $self->set_max ($max) 1906 $self->set_max ($max)
1663 if defined $max; 1907 if defined $max;
1664 1908
1665 $max = $self->{max_val}; 1909 return if $self->{val} == $val;
1910
1666 $self->{val} = $val; 1911 $self->{val} = $val;
1667
1668 $self->update; 1912 $self->update;
1669} 1913}
1670 1914
1671sub _draw { 1915sub _draw {
1672 my ($self) = @_; 1916 my ($self) = @_;
1673 1917
1674 my $tex = $tex{$self->{type}}; 1918 my $tex = $tex{$self->{type}};
1919 my ($t1, $t2, $t3) = @$tex;
1675 1920
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1921 my ($w, $h) = ($self->{w}, $self->{h});
1677 1922
1678 if ($self->{vertical}) { 1923 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1924 glRotate 90, 0, 0, 1;
… …
1681 1926
1682 ($w, $h) = ($h, $w); 1927 ($w, $h) = ($h, $w);
1683 } 1928 }
1684 1929
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1930 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1931
1688 my $t1 = $tex->[0]; 1932 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1933 my $ycut2 = max 0, min 1, $ycut - 1;
1934
1935 my $h1 = $self->{h} * (1 - $ycut1);
1936 my $h2 = $self->{h} * (1 - $ycut2);
1690 1937
1691 glEnable GL_BLEND; 1938 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1939 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1940 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1941 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1942
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1943 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1944 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1945 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1946 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1947 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1948 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1949 glEnd;
1706 1950
1951 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1952 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1953 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1954 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1955 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1956 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1957 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1958 glEnd;
1959
1960 if ($t3) {
1961 glBindTexture GL_TEXTURE_2D, $t3->{name};
1962 glBegin GL_QUADS;
1963 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1964 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1965 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1966 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1967 glEnd;
1968 }
1714 1969
1715 glDisable GL_BLEND; 1970 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1971 glDisable GL_TEXTURE_2D;
1717} 1972}
1718 1973
… …
1724 1979
1725sub new { 1980sub new {
1726 my ($class, %arg) = @_; 1981 my ($class, %arg) = @_;
1727 1982
1728 my $self = $class->SUPER::new ( 1983 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1984 tooltip => $arg{type},
1985 can_hover => 1,
1986 can_events => 1,
1730 %arg, 1987 %arg,
1731 ); 1988 );
1732 1989
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1990 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1991 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1992 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1993
1737 $self 1994 $self
1738} 1995}
1739 1996
… …
1742 1999
1743 $self->{value}->set_fontsize ($fsize); 2000 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2001 $self->{max} ->set_fontsize ($fsize);
1745} 2002}
1746 2003
2004sub set_max {
2005 my ($self, $max) = @_;
2006
2007 $self->{gauge}->set_max ($max);
2008 $self->{max}->set_text ($max);
2009}
2010
1747sub set_value { 2011sub set_value {
1748 my ($self, $val, $max) = @_; 2012 my ($self, $val, $max) = @_;
1749 2013
1750 $self->set_max ($max) 2014 $self->set_max ($max)
1751 if defined $max; 2015 if defined $max;
1752 2016
1753 $self->{gauge}->set_value ($val, $max); 2017 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2018 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 2019}
1763 2020
1764############################################################################# 2021#############################################################################
1765 2022
1766package CFClient::UI::Slider; 2023package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1777 2034
1778sub new { 2035sub new {
1779 my $class = shift; 2036 my $class = shift;
1780 2037
1781 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
1782 2039
1783 # TODO: 0-width page 2040 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2042 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2045 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5],
1789 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
1790 req_w => 20, 2049 req_w => $::WIDTH / 80,
1791 req_h => 20, 2050 req_h => $::WIDTH / 80,
1792 vertical => 0, 2051 vertical => 0,
1793 can_hover => 1, 2052 can_hover => 1,
1794 inner_pad => 5, 2053 inner_pad => .05,
1795 @_ 2054 @_
1796 ); 2055 );
1797 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
1798 $self 2060 $self
2061}
2062
2063sub set_value {
2064 my ($self, $value) = @_;
2065
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067
2068 $hi = $lo + 1 if $hi <= $lo;
2069
2070 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi;
2072
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079
2080 if ($value != $old_value) {
2081 $self->emit (changed => $value);
2082 $self->update;
2083 }
1799} 2084}
1800 2085
1801sub size_request { 2086sub size_request {
1802 my ($self) = @_; 2087 my ($self) = @_;
1803 2088
… …
1816 2101
1817sub mouse_motion { 2102sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
1819 2104
1820 if ($GRAB == $self) { 2105 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107
2108 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2111
2112 $self->set_value ($x * ($hi - $lo) + $lo);
2113 }
2114}
2115
2116sub update {
2117 my ($self) = @_;
2118
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]);
2121
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
1822 2123
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
1824 2125
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1826 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1827 2127
1828 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
1830 $x = $lo if $x < $lo;
1831 $x = $hi - $page if $x > $hi - $page;
1832 $self->{range}[0] = $x;
1833 2130
1834 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
1835 $self->update; 2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value;
2137 $self->{knob_w} = $page;
1836 } 2138 });
1837}
1838 2139
1839# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
1840# so that the handle doesn't leave the texture. This calculation isn't 100%
1841# correct propably, but it does the job for now
1842sub _calc_inner_pad_px {
1843 my ($self, $w) = @_;
1844 ($w / 100) * $self->{inner_pad} # % to pixels
1845} 2141}
1846 2142
1847sub _draw { 2143sub _draw {
1848 my ($self) = @_; 2144 my ($self) = @_;
1849 2145
1850 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
1851 2147
1852 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
1853 2149
1854 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
1856 2152
1857 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2155 }
1862 2156
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2159
1866 my ($value, $lo, $hi, $page) = @{$self->{range}};
1867
1868 $hi = $value + 1 if $lo == $hi;
1869
1870 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1871 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1872
1873 $page = int $page * $inner_w / ($hi - $lo);
1874 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1875
1876 $w -= $page;
1877 $page &= ~1;
1878 glTranslate $page * 0.5, 0, 0;
1879 $page ||= 2;
1880
1881 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1882 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1883
1884 glEnable GL_BLEND;
1885 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1886 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2162
1889 # draw background 2163 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2165
1892 # draw handle 2166 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1894 2168
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
1897} 2170}
1898 2171
1899############################################################################# 2172#############################################################################
1900 2173
… …
1906 2179
1907sub new { 2180sub new {
1908 my $class = shift; 2181 my $class = shift;
1909 2182
1910 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
1911 fontsize => 1, 2184 fontsize => 1,
2185 can_events => 0,
2186 #font => default_font
1912 @_, 2187 @_,
1913 2188
1914 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
1915 par => [], 2190 par => [],
1916 height => 0, 2191 height => 0,
1917 children => [ 2192 children => [
1918 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
1920 ], 2195 ],
1921 ); 2196 );
1922 2197
1923 $self->{children}[1]->connect (changed => sub { 2198 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2199
1927 $self 2200 $self
1928} 2201}
1929 2202
1930sub set_fontsize { 2203sub set_fontsize {
… …
1938 my ($self, $text) = @_; 2211 my ($self, $text) = @_;
1939 2212
1940 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
1941 2214
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2216 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2217 $layout->set_markup ($text);
1945 2218
1946 ($layout->size)[1] 2219 ($layout->size)[1]
1947} 2220}
1948 2221
1949sub reflow { 2222sub reflow {
… …
1956sub size_allocate { 2229sub size_allocate {
1957 my ($self, $w, $h) = @_; 2230 my ($self, $w, $h) = @_;
1958 2231
1959 $self->SUPER::size_allocate ($w, $h); 2232 $self->SUPER::size_allocate ($w, $h);
1960 2233
2234 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2235 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2236 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2237
1964 $self->reflow; 2238 $self->reflow;
1965} 2239}
… …
1986 2260
1987 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
1988 2262
1989 delete $self->{texture}; 2263 delete $self->{texture};
1990 2264
1991 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
1992 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2267 my $height = 0;
1994 2268
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
1996 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2275
2002 delete $self->{texture}; 2276 delete $self->{texture};
2003 } 2277 }
2004 2278
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2006 glClearColor 0, 0, 0, 1; 2280 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2008 2282
2009 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2285
2014 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2015 2287
… …
2018 2290
2019 my $y = 0; 2291 my $y = 0;
2020 2292
2021 my $layout = $self->{layout}; 2293 my $layout = $self->{layout};
2022 2294
2295 $layout->set_font ($self->{font}) if $self->{font};
2296
2023 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2298 my $h = $par->[0];
2025 2299
2026 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2027 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2028 2303
2029 glColor @{ $par->[1] };
2030 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2032 } 2306 }
2033 2307
2034 $y += $h; 2308 $y += $h;
2035 } 2309 }
2036 2310
2037 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND;
2039 }; 2312 };
2040 }); 2313 });
2041} 2314}
2042 2315
2043sub _draw { 2316sub _draw {
2044 my ($self) = @_; 2317 my ($self) = @_;
2045 2318
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2321 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2051 }
2052 2324
2053 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2054 2326
2055} 2327}
2056 2328
… …
2104 2376
2105sub new { 2377sub new {
2106 my $class = shift; 2378 my $class = shift;
2107 2379
2108 my $self = $class->SUPER::new ( 2380 my $self = $class->SUPER::new (
2109 state => 0, 2381 state => 0,
2110 connect_activate => \&toggle_flopper, 2382 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2383 @_
2113 ); 2384 );
2114 2385
2115 if ($self->{state}) { 2386 if ($self->{state}) {
2116 $self->{state} = 0; 2387 $self->{state} = 0;
… …
2151 @_, 2422 @_,
2152 can_events => 0, 2423 can_events => 0,
2153 ) 2424 )
2154} 2425}
2155 2426
2156sub set_text { 2427sub set_tooltip_from {
2157 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2158 2429
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2160 $self->{label}->set_text ($text); 2431 markup => $widget->{tooltip},
2161 $self->add ($self->{label}); 2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8,
2434 fg => [0, 0, 0, 1],
2435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 );
2162} 2437}
2163 2438
2164sub size_request { 2439sub size_request {
2165 my ($self) = @_; 2440 my ($self) = @_;
2166 2441
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2443
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2173} 2445}
2174 2446
2447sub size_allocate {
2448 my ($self, $w, $h) = @_;
2449
2450 $self->SUPER::size_allocate ($w - 4, $h - 4);
2451}
2452
2175sub _draw { 2453sub _draw {
2176 my ($self) = @_; 2454 my ($self) = @_;
2177 2455
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2180 2457
2181 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2182 2459
2183 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2471 glVertex 0 , $h;
2195 glVertex $w, $h; 2472 glVertex $w, $h;
2196 glVertex $w, 0; 2473 glVertex $w, 0;
2197 glEnd; 2474 glEnd;
2198 2475
2199 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2200
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2203} 2478}
2204 2479
2205############################################################################# 2480#############################################################################
2206 2481
2482package CFClient::UI::Face;
2483
2484our @ISA = CFClient::UI::Base::;
2485
2486use CFClient::OpenGL;
2487
2488sub new {
2489 my $class = shift;
2490
2491 $class->SUPER::new (
2492 aspect => 1,
2493 @_,
2494 )
2495}
2496
2497sub size_request {
2498 (32, 8)
2499}
2500
2501sub _draw {
2502 my ($self) = @_;
2503
2504 return unless $::CONN;#d# manage and cache textures differently
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2506
2507 # TODO animation
2508 if ($tex) {
2509 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D;
2514 }
2515}
2516
2517#############################################################################
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666
2667#############################################################################
2668
2669package CFClient::UI::Menu;
2670
2671our @ISA = CFClient::UI::FancyFrame::;
2672
2673use CFClient::OpenGL;
2674
2675sub new {
2676 my $class = shift;
2677
2678 my $self = $class->SUPER::new (
2679 items => [],
2680 z => 100,
2681 @_,
2682 );
2683
2684 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2685
2686 for my $item (@{ $self->{items} }) {
2687 my ($widget, $cb) = @$item;
2688
2689 # handle various types of items, only text for now
2690 if (!ref $widget) {
2691 $widget = new CFClient::UI::Label
2692 can_hover => 1,
2693 can_events => 1,
2694 text => $widget;
2695 }
2696
2697 $self->{item}{$widget} = $item;
2698
2699 $self->{vbox}->add ($widget);
2700 }
2701
2702 $self
2703}
2704
2705# popup given the event (must be a mouse button down event currently)
2706sub popup {
2707 my ($self, $ev) = @_;
2708
2709 $self->emit ("popdown");
2710
2711 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self;
2713 $self->{button} = $ev->{button};
2714
2715 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717}
2718
2719sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_;
2721
2722 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER};
2725}
2726
2727sub button_up {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB;
2732 $self->hide;
2733
2734 $self->emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover};
2736 }
2737}
2738
2739#############################################################################
2740
2741package CFClient::UI::Statusbox;
2742
2743our @ISA = CFClient::UI::VBox::;
2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2751 )
2752}
2753
2754sub reorder {
2755 my ($self) = @_;
2756 my $NOW = time;
2757
2758 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 }
2761
2762 my @widgets;
2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2769 my $count = 10 + 1;
2770 for my $item (@items) {
2771 last unless --$count;
2772
2773 push @widgets, $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text};
2778
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) {
2782 s/^\s+//;
2783 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 }
2787
2788 new CFClient::UI::Label
2789 markup => $short,
2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2793 fontsize => $fontsize,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2838}
2839
2840#############################################################################
2841
2207package CFClient::UI::Root; 2842package CFClient::UI::Root;
2208 2843
2209our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2210 2845
2211use CFClient::OpenGL; 2846use CFClient::OpenGL;
2212 2847
2213sub check_size { 2848sub new {
2214 my ($self) = @_; 2849 my $class = shift;
2215 2850
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2851 $class->SUPER::new (
2217} 2852 @_,
2218 2853 )
2219sub size_request {
2220 ($::WIDTH, $::HEIGHT)
2221} 2854}
2222 2855
2223sub configure { 2856sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2857 my ($self, $x, $y, $w, $h) = @_;
2225 2858
2226 $self->SUPER::configure ($x, $y, $w, $h); 2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2227 2862
2863sub check_size {
2864 my ($self) = @_;
2865
2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2868}
2869
2870sub size_request {
2871 my ($self) = @_;
2872
2873 ($self->{w}, $self->{h})
2874}
2875
2876sub size_allocate {
2877 my ($self, $w, $h) = @_;
2878
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2228 for my $child (@{$self->{children}}) { 2885 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 2887
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x};
2890
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892 if exists $child->{req_y};
2893
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896
2233 $child->configure ($X, $Y, $W,$H); 2897 $child->configure ($X, $Y, $W, $H);
2234 } 2898 }
2235} 2899}
2236 2900
2237sub _topleft { 2901sub coord2local {
2238 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2239 2903
2240 ($x, $y) 2904 ($x, $y)
2241} 2905}
2242 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2243sub update { 2913sub update {
2244 my ($self) = @_; 2914 my ($self) = @_;
2245 2915
2246 $self->check_size; 2916 $self->check_size;
2247 ::refresh (); 2917 $::WANT_REFRESH++;
2248} 2918}
2249 2919
2250sub add { 2920sub add {
2251 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2252 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2253 # integerize window positions 2926 # integerise window positions
2254 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2256 2930
2257 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2258} 2932}
2259 2933
2260sub on_refresh { 2934sub on_refresh {
2261 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2262 2936
2263 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2264} 2938}
2265 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2266sub draw { 2946sub draw {
2267 my ($self) = @_; 2947 my ($self) = @_;
2268 2948
2269 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2953
2954 if ($self->{check_size}) {
2955 my @queue = ([], []);
2956
2957 for (;;) {
2958 if ($self->{check_size}) {
2959 # heuristic: check containers last
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2961 for values %{delete $self->{check_size}}
2962 }
2963
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2965
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2967 ? @$widget{qw(user_w user_h)}
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973
2974 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h;
2976
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2978
2979 $widget->{parent}->check_size
2980 if $widget->{parent};
2981 }
2982 }
2983 }
2984
2985 while ($self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) {
2987 my ($widget, $w, $h) = @$_;
2988
2989 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0;
2991
2992 $widget->{w} = $w;
2993 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h);
2995 $widget->emit (size_allocate => $w, $h);
2996 }
2997 }
2998
2999 while ($self->{post_alloc_hook}) {
3000 $_->()
3001 for values %{delete $self->{post_alloc_hook}};
2271 } 3002 }
2272 3003
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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