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

Diff Legend

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