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.192 by root, Tue May 9 22:49:32 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
12our $ROOT; 14our $ROOT;
13our $TOOLTIP; 15our $TOOLTIP;
14our $BUTTON_STATE; 16our $BUTTON_STATE;
17
18our %WIDGET; # all widgets, weak-referenced
15 19
16sub check_tooltip { 20sub check_tooltip {
17 if (!$GRAB) { 21 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 23 if (length $widget->{tooltip}) {
… …
23 27
24 my $tip = $widget->{tooltip}; 28 my $tip = $widget->{tooltip};
25 29
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 30 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 31
28 $TOOLTIP->set_markup ($widget->{tooltip}); 32 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 33 $TOOLTIP->show;
31 34
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 36
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 38 if $x + $TOOLTIP->{w} > $::WIDTH;
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
39 } 43 }
40 44
41 return; 45 return;
42 } 46 }
43 } 47 }
… …
47 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
48} 52}
49 53
50# class methods for events 54# class methods for events
51sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 57 if $FOCUS;
54} 58}
55 59
56sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 62 if $FOCUS;
59} 63}
60 64
61sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
62 my ($ev) = @_; 66 my ($ev) = @_;
… …
71 check_tooltip; 75 check_tooltip;
72 } 76 }
73 77
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 79
76 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 82}
81 83
82sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
83 my ($ev) = @_; 85 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
85 87
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 89
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 91
90 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 94
95 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 97 $grab->update if $grab;
98 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 115
116 check_tooltip; 116 check_tooltip;
117 } 117 }
118 118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 120 if $HOVER;
123} 121}
124 122
125# convert position array to integers 123# convert position array to integers
126sub harmonize { 124sub harmonize {
127 my ($vals) = @_; 125 my ($vals) = @_;
… …
131 for (@$vals) { 129 for (@$vals) {
132 my $i = int $_ + $rem; 130 my $i = int $_ + $rem;
133 $rem += $_ - $i; 131 $rem += $_ - $i;
134 $_ = $i; 132 $_ = $i;
135 } 133 }
134}
135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
152# call when resolution changes etc.
153sub rescale_widgets {
154 my ($sx, $sy) = @_;
155
156 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167 }
168
169 reconfigure_widgets;
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
140package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
179} 214}
180 215
181sub hide { 216sub show_centered {
182 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
183 236
184 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
242
243 $self->focus_out;
244}
245
246sub hide {
247 my ($self) = @_;
248
249 $self->set_invisible;
186 250
187 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
188 if $self->{parent}; 252 if $self->{parent};
189} 253}
190 254
… …
240 304
241sub size_allocate { 305sub size_allocate {
242 # nothing to be done 306 # nothing to be done
243} 307}
244 308
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
245sub children { 316sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 317}
259 318
260sub set_max_size { 319sub set_max_size {
261 my ($self, $w, $h) = @_; 320 my ($self, $w, $h) = @_;
262 321
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 322 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 323 delete $self->{max_h}; $self->{max_h} = $h if $h;
324}
325
326sub set_tooltip {
327 my ($self, $tooltip) = @_;
328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
333
334 $self->{tooltip} = $tooltip;
335
336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
337 delete $CFClient::UI::TOOLTIP->{owner};
338 CFClient::UI::check_tooltip;
339 }
265} 340}
266 341
267# translate global coordinates to local coordinate system 342# translate global coordinates to local coordinate system
268sub coord2local { 343sub coord2local {
269 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 359 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
286 361
287 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
288 363
289 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
290 365
291 $focus->update if $focus; 366 $focus->update if $focus;
292 $FOCUS->update; 367 $FOCUS->update;
293} 368}
294 369
… …
297 372
298 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
299 374
300 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
301 376
302 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
303 378
304 $focus->update if $focus; #? 379 $focus->update if $focus; #?
380
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS;
305} 383}
306 384
307sub mouse_motion { } 385sub mouse_motion { }
308sub button_up { } 386sub button_up { }
309sub key_down { } 387sub key_down { }
310sub key_up { } 388sub key_up { }
311 389
312sub button_down { 390sub button_down {
313 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
314 392
315 $self->focus_in; 393 $self->focus_in;
… …
349 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix; 428 glPushMatrix;
351 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 432 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
358 glEnd; 436 glEnd;
359 glPopMatrix; 437 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 439 }
362} 440}
363 441
364sub _draw { 442sub _draw {
365 my ($self) = @_; 443 my ($self) = @_;
… …
380} 458}
381 459
382sub set_parent { 460sub set_parent {
383 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
384 462
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
387} 473}
388 474
389sub check_size { 475sub check_size {
390 my ($self) = @_; 476 my ($self, $forced) = @_;
391 477
478 $self->{force_alloc} = 1 if $forced;
392 $CFClient::UI::ROOT->{check_size}{$self} = $self; 479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393} 480}
394 481
395sub update { 482sub update {
396 my ($self) = @_; 483 my ($self) = @_;
… …
403 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
404 491
405 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
406} 493}
407 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
408sub emit { 501sub emit {
409 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
410 503
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
412} 506}
413 507
414sub DESTROY { 508sub DESTROY {
415 my ($self) = @_; 509 my ($self) = @_;
416 510
511 delete $WIDGET{$self+0};
417 #$self->deactivate; 512 #$self->deactivate;
418} 513}
419 514
420############################################################################# 515#############################################################################
421 516
… …
430 my $class = shift; 525 my $class = shift;
431 526
432 # range [value, low, high, page] 527 # range [value, low, high, page]
433 528
434 $class->SUPER::new ( 529 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 530 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 531 #active_bg => [1, 1, 1, 0.5],
437 @_ 532 @_
438 ) 533 )
439} 534}
440 535
441sub _draw { 536sub _draw {
442 my ($self) = @_; 537 my ($self) = @_;
443 538
539 my $color = $FOCUS == $self && $self->{active_bg}
540 ? $self->{active_bg}
541 : $self->{bg};
542
543 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 544 my ($w, $h) = @$self{qw(w h)};
445 545
446 glEnable GL_BLEND; 546 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 548 glColor @$color;
449 549
450 glBegin GL_QUADS; 550 glBegin GL_QUADS;
451 glVertex 0 , 0; 551 glVertex 0 , 0;
452 glVertex 0 , $h; 552 glVertex 0 , $h;
453 glVertex $w, $h; 553 glVertex $w, $h;
454 glVertex $w, 0; 554 glVertex $w, 0;
455 glEnd; 555 glEnd;
456 556
457 glDisable GL_BLEND; 557 glDisable GL_BLEND;
558 }
458} 559}
459 560
460############################################################################# 561#############################################################################
461 562
462package CFClient::UI::Empty; 563package CFClient::UI::Empty;
… …
506 $self->{children} = [ 607 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 608 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 609 @{$self->{children}}, @widgets
509 ]; 610 ];
510 611
511 $_->check_size 612 $self->check_size (1);
512 for @widgets;
513
514 $self->update; 613 $self->update;
515} 614}
516 615
517sub children { 616sub children {
518 @{ $_[0]{children} } 617 @{ $_[0]{children} }
… …
524 delete $child->{parent}; 623 delete $child->{parent};
525 $child->hide; 624 $child->hide;
526 625
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 627
529 $self->check_size; 628 $self->check_size (1);
530 $self->update; 629 $self->update;
531} 630}
532 631
533sub clear { 632sub clear {
534 my ($self) = @_; 633 my ($self) = @_;
… …
625} 724}
626 725
627sub update { 726sub update {
628 my ($self) = @_; 727 my ($self) = @_;
629 728
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 729 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 730 $self->SUPER::update;
632} 731}
633 732
634sub size_allocate { 733sub size_allocate {
635 my ($self, $w, $h) = @_; 734 my ($self, $w, $h) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 747 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 748 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 749 glClear GL_COLOR_BUFFER_BIT;
651 750
652 $self->_render; 751 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 752 };
661} 753}
662 754
663sub _draw { 755sub _draw {
664 my ($self) = @_; 756 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 758 my ($w, $h) = ($self->w, $self->h);
667 759
668 my $tex = $self->{texture} 760 my $tex = $self->{texture}
669 or return; 761 or return;
670 762
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 763 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 765 glColor 1, 1, 1, 1;
676 766
677 $tex->draw_quad (0, 0, $w, $h); 767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 768
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 769 glDisable GL_TEXTURE_2D;
681} 770}
682 771
683############################################################################# 772#############################################################################
684 773
685package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
686 775
687our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
688 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
689sub size_request { 788sub size_request {
690 my ($self) = @_; 789 my ($self) = @_;
691 790
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 792
695 @$self{qw(child_w child_h)} 793 @$self{qw(child_w child_h)}
696} 794}
697 795
698sub size_allocate { 796sub size_allocate {
699 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
700 798
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
802 $self->child->configure (0, 0, $w, $h);
701 $self->update; 803 $self->update;
702} 804}
703 805
704sub set_offset { 806sub set_offset {
705 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
759 861
760 my $slider = new CFClient::UI::Slider 862 my $slider = new CFClient::UI::Slider
761 vertical => 1, 863 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 864 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 865 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 866 $self->{vp}->set_offset (0, $_[1]);
765 }, 867 },
766 ; 868 ;
767 869
768 $self = $class->SUPER::new ( 870 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 871 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 872 slider => $slider,
771 @_, 873 @_,
772 ); 874 );
773 875
774 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
777 879
778 $self 880 $self
779} 881}
780 882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
896 $self->SUPER::size_allocate ($w, $h);
897
898 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
900}
901
781#TODO# update range on size_allocate depeneing on child 902#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 903# update viewport offset on scroll
783 904
784############################################################################# 905#############################################################################
785 906
786package CFClient::UI::Frame; 907package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 911use CFClient::OpenGL;
791 912
792sub new { 913sub new {
793 my $class = shift; 914 my $class = shift;
794 915
795 my $self = $class->SUPER::new ( 916 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 917 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 918 @_,
800 ); 919 )
801
802 $self
803} 920}
804 921
805sub _draw { 922sub _draw {
806 my ($self) = @_; 923 my ($self) = @_;
807 924
808 my ($w, $h) = ($self->{w}, $self->{h}); 925 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)};
809 927
810 glEnable GL_BLEND; 928 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 930 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 931
815# glBegin GL_QUADS; 932 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 933 glVertex 0 , 0;
818# glVertex 0 , $h; 934 glVertex 0 , $h;
819# glVertex $w, $h; 935 glVertex $w, $h;
820# glVertex $w, 0; 936 glVertex $w, 0;
821# glEnd; 937 glEnd;
822 938
823
824 $self->child->draw;
825 glDisable GL_BLEND; 939 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 940 }
941
942 $self->SUPER::_draw;
827} 943}
828 944
829############################################################################# 945#############################################################################
830 946
831package CFClient::UI::FancyFrame; 947package CFClient::UI::FancyFrame;
… …
842 my $class = shift; 958 my $class = shift;
843 959
844 # TODO: user_x, user_y, overwrite moveto? 960 # TODO: user_x, user_y, overwrite moveto?
845 961
846 my $self = $class->SUPER::new ( 962 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 963 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 964 border_bg => [1, 1, 1, 1],
849 border => 0.6, 965 border => 0.6,
966 is_toplevel => 1,
850 can_events => 1, 967 can_events => 1,
851 @_ 968 @_
852 ); 969 );
853 970
854 $self->{title} &&= new CFClient::UI::Label 971 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 972 align => 0,
… …
879 my ($self, $w, $h) = @_; 996 my ($self, $w, $h) = @_;
880 997
881 $h -= List::Util::max 0, $self->border * 2; 998 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 999 $w -= List::Util::max 0, $self->border * 2;
883 1000
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1002 if $self->{title};
886 1003
887 $self->child->configure ($self->border, $self->border, $w, $h); 1004 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1005}
889 1006
… …
947 my ($self) = @_; 1064 my ($self) = @_;
948 1065
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1066 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1068
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1069 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1071
957 my $border = $self->border; 1072 my $border = $self->border;
958 1073
959 glColor @{ $self->{border_bg} }; 1074 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1079
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1081 my $bg = $tex[0];
967 1082
968 # TODO: repeat texture not scale 1083 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1087 glColor @{ $self->{bg} };
973 1088
974 $bg->{s} = $rep_x; 1089 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1090 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1091 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 }
978 1094
979 glDisable GL_TEXTURE_2D; 1095 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1096
983 $self->{title}->draw if $self->{title}; 1097 $self->{title}->draw if $self->{title};
984 1098
985 $self->child->draw; 1099 $self->child->draw;
986} 1100}
… …
998sub new { 1112sub new {
999 my $class = shift; 1113 my $class = shift;
1000 1114
1001 $class->SUPER::new ( 1115 $class->SUPER::new (
1002 col_expand => [], 1116 col_expand => [],
1003 @_ 1117 @_,
1004 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1123}
1006 1124
1007sub add { 1125sub add {
1008 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1009 1127
1010 $child->set_parent ($self); 1128 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1012 1130
1013 $child->check_size; 1131 $self->check_size (1);
1014} 1132}
1015 1133
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1135sub clear {
1022 my ($self) = @_; 1136 my ($self) = @_;
1023 1137
1024 my @children = $self->children; 1138 my @children = $self->children;
1025 delete $self->{children}; 1139 delete $self->{children};
… …
1027 for (@children) { 1141 for (@children) {
1028 delete $_->{parent}; 1142 delete $_->{parent};
1029 $_->hide; 1143 $_->hide;
1030 } 1144 }
1031 1145
1146 $self->check_size (1);
1032 $self->update; 1147 $self->update;
1033} 1148}
1034 1149
1035sub get_wh { 1150sub get_wh {
1036 my ($self) = @_; 1151 my ($self) = @_;
… …
1068sub size_allocate { 1183sub size_allocate {
1069 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1070 1185
1071 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1072 1187
1073 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1075 1190
1076 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1213} 1328}
1214 1329
1215sub size_allocate { 1330sub size_allocate {
1216 my ($self, $w, $h) = @_; 1331 my ($self, $w, $h) = @_;
1217 1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1218 my $children = $self->{children}; 1335 my $children = $self->{children};
1219 1336
1220 my @h = map $_->{req_h}, @$children; 1337 my @h = map $_->{req_h}, @$children;
1221 1338
1222 my $req_h = List::Util::sum @h; 1339 my $req_h = List::Util::sum @h;
… …
1251 1368
1252############################################################################# 1369#############################################################################
1253 1370
1254package CFClient::UI::Label; 1371package CFClient::UI::Label;
1255 1372
1256our @ISA = CFClient::UI::Base::; 1373our @ISA = CFClient::UI::DrawBG::;
1257 1374
1258use CFClient::OpenGL; 1375use CFClient::OpenGL;
1259 1376
1260sub new { 1377sub new {
1261 my ($class, %arg) = @_; 1378 my ($class, %arg) = @_;
1262 1379
1263 my $self = $class->SUPER::new ( 1380 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1381 fg => [1, 1, 1],
1382 #bg => none
1383 #active_bg => none
1265 #font => default_font 1384 #font => default_font
1385 #text => initial text
1386 #markup => initial narkup
1387 #max_w => maximum pixel width
1388 ellipsise => 3, # end
1389 layout => (new CFClient::Layout),
1266 fontsize => 1, 1390 fontsize => 1,
1267 text => "",
1268 align => -1, 1391 align => -1,
1269 valign => -1, 1392 valign => -1,
1270 padding => 2, 1393 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1394 can_events => 0,
1273 %arg 1395 %arg
1274 ); 1396 );
1275 1397
1276 if (exists $self->{template}) { 1398 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1399 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1400 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1401 $self->{template} = $layout;
1280 } 1402 }
1281 1403
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1404 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1405 $self->set_markup (delete $self->{markup});
1406 } else {
1407 $self->set_text (delete $self->{text});
1408 }
1284 1409
1285 $self 1410 $self
1286} 1411}
1287 1412
1288sub escape { 1413sub escape($) {
1289 local $_ = $_[1]; 1414 local $_ = $_[0];
1290 1415
1291 s/&/&amp;/g; 1416 s/&/&amp;/g;
1292 s/>/&gt;/g; 1417 s/>/&gt;/g;
1293 s/</&lt;/g; 1418 s/</&lt;/g;
1294 1419
1295 $_[1] 1420 $_
1296} 1421}
1297 1422
1298sub update { 1423sub update {
1299 my ($self) = @_; 1424 my ($self) = @_;
1300 1425
… …
1306 my ($self, $text) = @_; 1431 my ($self, $text) = @_;
1307 1432
1308 return if $self->{text} eq "T$text"; 1433 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1434 $self->{text} = "T$text";
1310 1435
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1437 $self->{layout}->set_text ($text);
1312 1438
1313 $self->update; 1439 $self->update;
1314 $self->check_size; 1440 $self->check_size;
1315} 1441}
… …
1318 my ($self, $markup) = @_; 1444 my ($self, $markup) = @_;
1319 1445
1320 return if $self->{text} eq "M$markup"; 1446 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1447 $self->{text} = "M$markup";
1322 1448
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1452 $self->{layout}->set_markup ($markup);
1324 1453
1325 $self->update; 1454 $self->update;
1326 $self->check_size; 1455 $self->check_size;
1327} 1456}
… …
1329sub size_request { 1458sub size_request {
1330 my ($self) = @_; 1459 my ($self) = @_;
1331 1460
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1461 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1); 1462 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1466
1336 my ($w, $h) = $self->{layout}->size; 1467 my ($w, $h) = $self->{layout}->size;
1337 1468
1338 if (exists $self->{template}) { 1469 if (exists $self->{template}) {
… …
1368} 1499}
1369 1500
1370sub _draw { 1501sub _draw {
1371 my ($self) = @_; 1502 my ($self) = @_;
1372 1503
1504 $self->SUPER::_draw; # draw background, if applicable
1505
1373 my $tex = $self->{texture} ||= do { 1506 my $tex = $self->{texture} ||= do {
1507 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1508 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1509 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513
1377 new_from_layout CFClient::Texture $self->{layout} 1514 my $tex = new_from_layout CFClient::Texture $self->{layout};
1515
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1518 : ($self->{w} - $tex->{w}) * 0.5);
1519
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1522 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1378 }; 1525 };
1379 1526
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1527 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1529
1530 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1531 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1533 } else {
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1535 }
1400 1536
1401 glDisable GL_TEXTURE_2D; 1537 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1538}
1404 1539
1405############################################################################# 1540#############################################################################
1406 1541
1407package CFClient::UI::EntryBase; 1542package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1421 can_hover => 1, 1556 can_hover => 1,
1422 can_focus => 1, 1557 can_focus => 1,
1423 valign => 0, 1558 valign => 0,
1424 can_events => 1, 1559 can_events => 1,
1560 #text => ...
1425 @_ 1561 @_
1426 ) 1562 )
1427} 1563}
1428 1564
1429sub _set_text { 1565sub _set_text {
… …
1439 $self->{text} = $text; 1575 $self->{text} = $text;
1440 1576
1441 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1443 1579
1444 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1445}
1446
1447sub get_text {
1448 $_[0]{text}
1449}
1450
1451sub size_request {
1452 my ($self) = @_;
1453
1454 my ($w, $h) = $self->SUPER::size_request;
1455
1456 ($w + 1, $h) # add 1 for cursor
1457}
1458
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463} 1581}
1464 1582
1465sub set_text { 1583sub set_text {
1466 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1467 1585
1468 $self->{cursor} = length $text; 1586 $self->{cursor} = length $text;
1469 $self->_set_text ($text); 1587 $self->_set_text ($text);
1470 $self->update; 1588 $self->update;
1589 $self->check_size;
1590}
1591
1592sub get_text {
1593 $_[0]{text}
1594}
1595
1596sub size_request {
1597 my ($self) = @_;
1598
1599 my ($w, $h) = $self->SUPER::size_request;
1600
1601 ($w + 1, $h) # add 1 for cursor
1471} 1602}
1472 1603
1473sub key_down { 1604sub key_down {
1474 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1475 1606
… …
1477 my $sym = $ev->{sym}; 1608 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1609 my $uni = $ev->{unicode};
1479 1610
1480 my $text = $self->get_text; 1611 my $text = $self->get_text;
1481 1612
1482 if ($sym == 8) { 1613 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1614 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1615 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1616 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1617 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1618 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1619 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1620 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1625 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1626 $self->_emit ('escape');
1496 } elsif ($uni) { 1627 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1629 }
1499 1630
1500 $self->_set_text ($text); 1631 $self->_set_text ($text);
1501 $self->update; 1632 $self->update;
1633 $self->check_size;
1502} 1634}
1503 1635
1504sub focus_in { 1636sub focus_in {
1505 my ($self) = @_; 1637 my ($self) = @_;
1506 1638
… …
1586 if ($sym == 13) { 1718 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1592 $self->update; 1724 $self->update;
1593 1725
1594 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
… …
1635 my $class = shift; 1767 my $class = shift;
1636 1768
1637 $class->SUPER::new ( 1769 $class->SUPER::new (
1638 padding => 4, 1770 padding => 4,
1639 fg => [1, 1, 1], 1771 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1772 active_fg => [0, 0, 1],
1642 can_hover => 1, 1773 can_hover => 1,
1643 align => 0, 1774 align => 0,
1644 valign => 0, 1775 valign => 0,
1645 can_events => 1, 1776 can_events => 1,
1646 @_ 1777 @_
1647 ) 1778 )
1648} 1779}
1649 1780
1781sub activate { }
1782
1650sub button_up { 1783sub button_up {
1651 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1652 1785
1786 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate");
1656 }
1657} 1789}
1658 1790
1659sub _draw { 1791sub _draw {
1660 my ($self) = @_; 1792 my ($self) = @_;
1661 1793
… …
1663 1795
1664 if ($GRAB == $self) { 1796 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1797 $self->{fg} = $self->{active_fg};
1666 } 1798 }
1667 1799
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1800 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1802 glColor 0, 0, 0, 1;
1673 1803
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1804 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1805
1676 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1807
1679 $self->SUPER::_draw; 1808 $self->SUPER::_draw;
1680} 1809}
1681 1810
1682############################################################################# 1811#############################################################################
… …
1696 1825
1697 $class->SUPER::new ( 1826 $class->SUPER::new (
1698 padding => 2, 1827 padding => 2,
1699 fg => [1, 1, 1], 1828 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1829 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1832 state => 0,
1702 can_hover => 1, 1833 can_hover => 1,
1703 @_ 1834 @_
1704 ) 1835 )
1705} 1836}
… …
1714 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1715 1846
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1720 } 1851 }
1721} 1852}
1722 1853
1723sub _draw { 1854sub _draw {
1724 my ($self) = @_; 1855 my ($self) = @_;
… …
1729 1860
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1861 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731 1862
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1864
1734 glEnable GL_BLEND; 1865 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866
1735 glEnable GL_TEXTURE_2D; 1867 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1868 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1869 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1870}
1745 1871
1746############################################################################# 1872#############################################################################
1747 1873
1748package CFClient::UI::Image; 1874package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1917 glTranslate 0, -$self->{w}, 0;
1792 1918
1793 ($w, $h) = ($h, $w); 1919 ($w, $h) = ($h, $w);
1794 } 1920 }
1795 1921
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1922 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1924
1801 $tex->draw_quad (0, 0, $w, $h); 1925 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1926
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1805} 1928}
1806 1929
1807############################################################################# 1930#############################################################################
1808 1931
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2120 qw(s1_slider.png s1_slider_bg.png);
1998 2121
1999sub new { 2122sub new {
2000 my $class = shift; 2123 my $class = shift;
2001 2124
2002 # range [value, low, high, page] 2125 # range [value, low, high, page, unit]
2003 2126
2004 # TODO: 0-width page 2127 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2128 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2129 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2131 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2135 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2136 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2137 req_h => $::WIDTH / 80,
2013 vertical => 0, 2138 vertical => 0,
2014 can_hover => 1, 2139 can_hover => 1,
2015 inner_pad => 5, 2140 inner_pad => 0.02,
2016 @_ 2141 @_
2017 ); 2142 );
2018 2143
2144 $self->set_value ($self->{range}[0]);
2145 $self->update;
2146
2019 $self 2147 $self
2148}
2149
2150sub set_range {
2151 my ($self, $range) = @_;
2152
2153 ($range, $self->{range}) = ($self->{range}, $range);
2154
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2157}
2158
2159sub set_value {
2160 my ($self, $value) = @_;
2161
2162 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2163
2164 $hi = $lo + 1 if $hi <= $lo;
2165
2166 $page = $hi - $lo if $page > $hi - $lo;
2167
2168 $value = $lo if $value < $lo;
2169 $value = $hi - $page if $value > $hi - $page;
2170
2171 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2172 if $unit;
2173
2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2175
2176 if ($value != $old_value) {
2177 $self->_emit (changed => $value);
2178 $self->update;
2179 }
2020} 2180}
2021 2181
2022sub size_request { 2182sub size_request {
2023 my ($self) = @_; 2183 my ($self) = @_;
2024 2184
… …
2030 2190
2031sub button_down { 2191sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
2033 2193
2034 $self->SUPER::button_down ($ev, $x, $y); 2194 $self->SUPER::button_down ($ev, $x, $y);
2195
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197
2035 $self->mouse_motion ($ev, $x, $y); 2198 $self->mouse_motion ($ev, $x, $y);
2036} 2199}
2037 2200
2038sub mouse_motion { 2201sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
2040 2203
2041 if ($GRAB == $self) { 2204 if ($GRAB == $self) {
2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2206
2207 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2212 }
2213}
2214
2215sub update {
2216 my ($self) = @_;
2217
2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2219 $self->set_value ($self->{range}[0]);
2220
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2221 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100;
2043 2223
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2224 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2225
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2226 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2227 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2228
2049 $x -= $inner_pad_px; # substract the padding 2229 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2230 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2231
2055 $self->emit (changed => $x); 2232 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2233 $self->{knob_w} = $knob_w;
2057 } 2234 });
2058}
2059 2235
2060# the inner_* stuff is for generating a padding for the slider handle, 2236 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2237}
2067 2238
2068sub _draw { 2239sub _draw {
2069 my ($self) = @_; 2240 my ($self) = @_;
2070 2241
2071 $self->SUPER::_draw (); 2242 $self->SUPER::_draw ();
2072 2243
2073 my ($w, $h) = @$self{qw(w h)}; 2244 glScale $self->{w}, $self->{h};
2074 2245
2075 if ($self->{vertical}) { 2246 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2247 # draw a vertical slider like a rotated horizontal slider
2077 2248
2249 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2250 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2251 }
2083 2252
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2253 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2254 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2255
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2258
2110 # draw background 2259 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2260 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2261
2113 # draw handle 2262 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2263 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2264
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2265 glDisable GL_TEXTURE_2D;
2118} 2266}
2267
2268#############################################################################
2269
2270package CFClient::UI::ValSlider;
2271
2272our @ISA = CFClient::UI::HBox::;
2273
2274sub new {
2275 my ($class, %arg) = @_;
2276
2277 my $range = delete $arg{range};
2278
2279 my $self = $class->SUPER::new (
2280 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2281 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2282 to_value => sub { shift },
2283 from_value => sub { shift },
2284 %arg,
2285 );
2286
2287 $self->{slider}->connect (changed => sub {
2288 my ($self, $value) = @_;
2289 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2290 $self->{parent}->emit (changed => $value);
2291 });
2292
2293# $self->{entry}->connect (changed => sub {
2294# my ($self, $value) = @_;
2295# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2296# $self->{parent}->emit (changed => $value);
2297# });
2298
2299 $self->add ($self->{slider}, $self->{entry});
2300
2301 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2302
2303 $self
2304}
2305
2306sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) }
2119 2308
2120############################################################################# 2309#############################################################################
2121 2310
2122package CFClient::UI::TextView; 2311package CFClient::UI::TextView;
2123 2312
… …
2132 fontsize => 1, 2321 fontsize => 1,
2133 can_events => 0, 2322 can_events => 0,
2134 #font => default_font 2323 #font => default_font
2135 @_, 2324 @_,
2136 2325
2137 layout => (new CFClient::Layout), 2326 layout => (new CFClient::Layout 1),
2138 par => [], 2327 par => [],
2139 height => 0, 2328 height => 0,
2140 children => [ 2329 children => [
2141 (new CFClient::UI::Empty expand => 1), 2330 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2331 (new CFClient::UI::Slider vertical => 1),
… …
2153 2342
2154 $self->{fontsize} = $fontsize; 2343 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2344 $self->reflow;
2156} 2345}
2157 2346
2158sub text_height {
2159 my ($self, $text) = @_;
2160
2161 my $layout = $self->{layout};
2162
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text);
2166
2167 ($layout->size)[1]
2168}
2169
2170sub reflow {
2171 my ($self) = @_;
2172
2173 $self->{need_reflow}++;
2174 $self->update;
2175}
2176
2177sub size_allocate { 2347sub size_allocate {
2178 my ($self, $w, $h) = @_; 2348 my ($self, $w, $h) = @_;
2179 2349
2180 $self->SUPER::size_allocate ($w, $h); 2350 $self->SUPER::size_allocate ($w, $h);
2181 2351
… …
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2354 $self->{layout}->set_width ($self->{children}[0]{w});
2185 2355
2186 $self->reflow; 2356 $self->reflow;
2187} 2357}
2188 2358
2359sub text_size {
2360 my ($self, $text, $indent) = @_;
2361
2362 my $layout = $self->{layout};
2363
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $layout->set_width ($self->{children}[0]{w} - $indent);
2366 $layout->set_markup ($text);
2367
2368 $layout->size
2369}
2370
2371sub reflow {
2372 my ($self) = @_;
2373
2374 $self->{need_reflow}++;
2375 $self->update;
2376}
2377
2378sub set_offset {
2379 my ($self, $offset) = @_;
2380
2381 # todo: base offset on lines or so, not on pixels
2382 $self->{children}[1]->set_value ($offset);
2383}
2384
2385sub clear {
2386 my ($self) = @_;
2387
2388 $self->{par} = [];
2389 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391}
2392
2189sub add_paragraph { 2393sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2394 my ($self, $color, $text, $indent) = @_;
2191 2395
2192 #TODO: intelligently "reformat" paragraph 2396 for my $line (split /\n/, $text) {
2193 2397 my ($w, $h) = $self->text_size ($line);
2194 my $height = $self->text_height ($text);
2195
2196 $self->{height} += $height; 2398 $self->{height} += $h;
2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2400 }
2197 2401
2198 push @{$self->{par}}, [$height, $color, $text];
2199
2200 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2402 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2201 $self->{children}[1]->update;
2202} 2403}
2203 2404
2204sub update { 2405sub update {
2205 my ($self) = @_; 2406 my ($self) = @_;
2206 2407
… …
2208 2409
2209 return unless $self->{h} > 0; 2410 return unless $self->{h} > 0;
2210 2411
2211 delete $self->{texture}; 2412 delete $self->{texture};
2212 2413
2213 $ROOT->on_refresh ($self, sub { 2414 $ROOT->on_post_alloc ($self, sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416
2214 if (delete $self->{need_reflow}) { 2417 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2418 my $height = 0;
2216 2419
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2218 for @{$self->{par}}; 2424 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]);
2427 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h;
2431 }
2432
2433 $height += $_->[1];
2434 }
2219 2435
2220 $self->{height} = $height; 2436 $self->{height} = $height;
2221 2437
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223 2439
2224 delete $self->{texture}; 2440 delete $self->{texture};
2225 } 2441 }
2226 2442
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228 glClearColor 0, 0, 0, 0; 2444 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2445 glClear GL_COLOR_BUFFER_BIT;
2230 2446
2447 my $top = int $self->{children}[1]{range}[0];
2448
2449 my $y0 = $top;
2450 my $y1 = $top + $H;
2451
2452 my $y = 0;
2453
2454 my $layout = $self->{layout};
2455
2456 $layout->set_font ($self->{font}) if $self->{font};
2457
2231 glEnable GL_BLEND; 2458 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 my $top = int $self->{children}[1]{range}[0];
2237
2238 my $y0 = $top;
2239 my $y1 = $top + $self->{h};
2240
2241 my $y = 0;
2242
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246 2461
2247 for my $par (@{$self->{par}}) { 2462 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2463 my $h = $par->[1];
2249 2464
2250 if ($y0 < $y + $h && $y < $y1) { 2465 if ($y0 < $y + $h && $y < $y1) {
2466 $layout->set_foreground (@{ $par->[2] });
2467 $layout->set_width ($W - $par->[3]);
2251 $layout->set_text ($par->[2]); 2468 $layout->set_markup ($par->[4]);
2252 2469
2253 glColor @{ $par->[1] }; 2470 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254 my ($W, $H) = $layout->size; 2471
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2472 glRasterPos $par->[3], $y - $y0;
2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256 } 2474 }
2257 2475
2258 $y += $h; 2476 $y += $h;
2259 } 2477 }
2260 2478
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2479 glDisable GL_BLEND;
2263 }; 2480 };
2264 }); 2481 });
2265} 2482}
2266 2483
2267sub _draw { 2484sub _draw {
2268 my ($self) = @_; 2485 my ($self) = @_;
2269 2486
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2487 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2489 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2492
2279 $self->{children}[1]->draw; 2493 $self->{children}[1]->draw;
2280 2494
2281} 2495}
2282 2496
… …
2350 2564
2351 # TODO: use animation 2565 # TODO: use animation
2352 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open"); 2569 $self->_emit ("open");
2356 } else { 2570 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close"); 2572 $self->_emit ("close");
2359 } 2573 }
2360 2574
2361 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2362} 2576}
2363 2577
2364############################################################################# 2578#############################################################################
2365 2579
2366package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
… …
2376 @_, 2590 @_,
2377 can_events => 0, 2591 can_events => 0,
2378 ) 2592 )
2379} 2593}
2380 2594
2381sub set_markup { 2595sub set_tooltip_from {
2382 my ($self, $text) = @_; 2596 my ($self, $widget) = @_;
2383 2597
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2598 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2599 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8,
2602 fg => [0, 0, 0, 1],
2603 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP),
2605 );
2387} 2606}
2388 2607
2389sub size_request { 2608sub size_request {
2390 my ($self) = @_; 2609 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2610
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2611 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2612
2396 ($w + 4, $h + 4) 2613 ($w + 4, $h + 4)
2397} 2614}
… …
2403} 2620}
2404 2621
2405sub _draw { 2622sub _draw {
2406 my ($self) = @_; 2623 my ($self) = @_;
2407 2624
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2625 glTranslate 0.375, 0.375;
2410 2626
2411 my ($w, $h) = @$self{qw(w h)}; 2627 my ($w, $h) = @$self{qw(w h)};
2412 2628
2413 glColor 1, 0.8, 0.4; 2629 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2640 glVertex 0 , $h;
2425 glVertex $w, $h; 2641 glVertex $w, $h;
2426 glVertex $w, 0; 2642 glVertex $w, 0;
2427 glEnd; 2643 glEnd;
2428 2644
2429 glPopMatrix; 2645 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2646 $self->SUPER::_draw;
2433} 2647}
2434 2648
2435############################################################################# 2649#############################################################################
2436 2650
… …
2441use CFClient::OpenGL; 2655use CFClient::OpenGL;
2442 2656
2443sub new { 2657sub new {
2444 my $class = shift; 2658 my $class = shift;
2445 2659
2446 $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2447 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2448 @_, 2663 @_,
2449 ) 2664 );
2665
2666 if ($self->{anim} && $self->{animspeed}) {
2667 Scalar::Util::weaken (my $widget = $self);
2668
2669 $self->{timer} = Event->timer (
2670 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2671 hard => 1,
2672 interval => $self->{animspeed},
2673 cb => sub {
2674 ++$widget->{frame};
2675 $widget->update;
2676 },
2677 );
2678 }
2679
2680 $self
2450} 2681}
2451 2682
2452sub size_request { 2683sub size_request {
2453 (32, 8) 2684 (32, 8)
2454} 2685}
2455 2686
2687sub update {
2688 my ($self) = @_;
2689
2690 return unless $self->{visible};
2691
2692 $self->SUPER::update;
2693}
2694
2456sub _draw { 2695sub _draw {
2457 my ($self) = @_; 2696 my ($self) = @_;
2458 2697
2459 return unless $::CONN;#d# manage and cache textures differently 2698 return unless $::CONN;
2699
2700 my $face;
2701
2702 if ($self->{frame}) {
2703 my $anim = $::CONN->{anim}[$self->{anim}];
2704
2705 $face = $anim->[ $self->{frame} % @$anim ]
2706 if $anim && @$anim;
2707 }
2708
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2710
2462 # TODO animation
2463 if ($tex) { 2711 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2712 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2714 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2716 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2717 }
2718}
2719
2720sub DESTROY {
2721 my ($self) = @_;
2722
2723 $self->{timer}->cancel
2724 if $self->{timer};
2725
2726 $self->SUPER::DESTROY;
2473} 2727}
2474 2728
2475############################################################################# 2729#############################################################################
2476 2730
2477package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2478 2732
2479our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2480 2734
2481sub new { 2735sub new {
2482 my $class = shift; 2736 my $class = shift;
2483 2737
2484 my %args = @_;
2485
2486 my $item = delete $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2494 can_hover => 1, 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525
2526 $self->add (new CFClient::UI::Face
2527 can_events => 0,
2528 face => $item->{face},
2529 anim => $item->{anim},
2530 animspeed => $item->{animspeed},
2531 );
2532
2533 $self->add (new CFClient::UI::Label
2534 can_events => 0,
2535 text => $desc,
2536 );
2537
2538 $self
2539}
2540
2541#############################################################################
2542
2543package CFClient::UI::Inventory;
2544
2545our @ISA = CFClient::UI::ScrolledWindow::;
2546
2547sub new {
2548 my $class = shift;
2549
2550 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox),
2552 @_, 2740 @_,
2553 ); 2741 );
2554 2742
2555 $self 2743 $self
2556} 2744}
… …
2559 my ($self, $items) = @_; 2747 my ($self, $items) = @_;
2560 2748
2561 $self->{scrolled}->clear; 2749 $self->{scrolled}->clear;
2562 return unless $items; 2750 return unless $items;
2563 2751
2564 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2565 2756
2566 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2567 2758
2759 my $row = 0;
2568 for my $item (@items) { 2760 for my $item (@items) {
2569 my $desc = $item->{nrof} < 2 2761 CFClient::Item::update_widgets $item;
2570 ? $item->{name}
2571 : "$item->{nrof} $item->{name_pl}";
2572 2762
2573 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2574 } 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2575 2766
2576# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2577} 2769}
2578 2770
2579sub size_request { 2771sub size_request {
2580 my ($self) = @_; 2772 my ($self) = @_;
2581 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2621 2813
2622# popup given the event (must be a mouse button down event currently) 2814# popup given the event (must be a mouse button down event currently)
2623sub popup { 2815sub popup {
2624 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2625 2817
2626 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2627 2819
2628 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2629 $GRAB = $self; 2821 $GRAB = $self;
2630 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2631 2823
… …
2646 2838
2647 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2648 undef $GRAB; 2840 undef $GRAB;
2649 $self->hide; 2841 $self->hide;
2650 2842
2651 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2652 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2653 } 2845 }
2654} 2846}
2655 2847
2656############################################################################# 2848#############################################################################
2657 2849
2658package CFClient::UI::Root; 2850package CFClient::UI::Statusbox;
2659 2851
2660our @ISA = CFClient::UI::Container::; 2852our @ISA = CFClient::UI::VBox::;
2661
2662use CFClient::OpenGL;
2663 2853
2664sub new { 2854sub new {
2665 my $class = shift; 2855 my $class = shift;
2666 2856
2667 $class->SUPER::new ( 2857 $class->SUPER::new (
2858 fontsize => 0.8,
2668 @_, 2859 @_,
2669 ) 2860 )
2670} 2861}
2671 2862
2863sub reorder {
2864 my ($self) = @_;
2865 my $NOW = time;
2866
2867 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 }
2870
2871 my @widgets;
2872
2873 my @items = sort {
2874 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} };
2877
2878 my $count = 10 + 1;
2879 for my $item (@items) {
2880 last unless --$count;
2881
2882 push @widgets, $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text};
2887
2888 for ($short) {
2889 s/^\s+//;
2890 s/\s+/ /g;
2891 }
2892
2893 new CFClient::UI::Label
2894 markup => $short,
2895 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg},
2901 can_events => 1,
2902 can_hover => 1
2903 };
2904 }
2905
2906 $self->clear;
2907 $self->SUPER::add (reverse @widgets);
2908}
2909
2910sub add {
2911 my ($self, $text, %arg) = @_;
2912
2913 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2917
2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2919
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921
2922 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) {
2924 $item->{count}++;
2925 } else {
2926 $item->{count} = 1;
2927 $item->{text} = $item->{tooltip} = $text;
2928 }
2929 $item->{id} = ++$self->{id};
2930 $item->{timeout} = $timeout;
2931 delete $item->{label};
2932 } else {
2933 $self->{item}{$group} = {
2934 id => ++$self->{id},
2935 text => $text,
2936 timeout => $timeout,
2937 tooltip => $text,
2938 fg => [0.8, 0.8, 0.8, 0.8],
2939 pri => 0,
2940 count => 1,
2941 %arg,
2942 };
2943 }
2944
2945 $self->reorder;
2946}
2947
2948sub reconfigure {
2949 my ($self) = @_;
2950
2951 delete $_->{label}
2952 for values %{ $self->{item} || {} };
2953
2954 $self->reorder;
2955 $self->SUPER::reconfigure;
2956}
2957
2958#############################################################################
2959
2960package CFClient::UI::Root;
2961
2962our @ISA = CFClient::UI::Container::;
2963
2964use CFClient::OpenGL;
2965
2966sub new {
2967 my $class = shift;
2968
2969 $class->SUPER::new (
2970 visible => 1,
2971 @_,
2972 )
2973}
2974
2672sub configure { 2975sub configure {
2673 my ($self, $x, $y, $w, $h) = @_; 2976 my ($self, $x, $y, $w, $h) = @_;
2674 2977
2675 $self->{w} = $w; 2978 $self->{w} = $w;
2676 $self->{h} = $h; 2979 $self->{h} = $h;
… …
2690} 2993}
2691 2994
2692sub size_allocate { 2995sub size_allocate {
2693 my ($self, $w, $h) = @_; 2996 my ($self, $w, $h) = @_;
2694 2997
2695 my $old_w = $self->{old_w};
2696 my $old_h = $self->{old_h};
2697
2698 if ($old_w && $old_h) {
2699 for my $child ($self->children) {
2700 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2701 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2702 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2703 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2704 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2705 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2706 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2707 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2708 }
2709 }
2710
2711 for my $child ($self->children) { 2998 for my $child ($self->children) {
2712 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2713 3000
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3002 if exists $child->{req_x};
3003
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3005 if exists $child->{req_y};
3006
2714 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2715 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009
2716 $child->configure ($X, $Y, $W, $H); 3010 $child->configure ($X, $Y, $W, $H);
2717 } 3011 }
2718
2719 $self->{old_w} = $w;
2720 $self->{old_h} = $h;
2721} 3012}
2722 3013
2723sub coord2local { 3014sub coord2local {
2724 my ($self, $x, $y) = @_; 3015 my ($self, $x, $y) = @_;
2725 3016
… …
2738 $self->check_size; 3029 $self->check_size;
2739 $::WANT_REFRESH++; 3030 $::WANT_REFRESH++;
2740} 3031}
2741 3032
2742sub add { 3033sub add {
2743 my ($self, $child) = @_; 3034 my ($self, @children) = @_;
2744 3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1;
3044
2745 # integerise window positions 3045 # integerise window positions
2746 $child->{x} = int $child->{x}; 3046 $child->{x} = int $child->{x};
2747 $child->{y} = int $child->{y}; 3047 $child->{y} = int $child->{y};
3048 }
2748 3049
2749 $self->SUPER::add ($child); 3050 $self->SUPER::add (@children);
3051}
3052
3053sub remove {
3054 my ($self, @children) = @_;
3055
3056 $self->SUPER::remove (@children);
3057
3058 while (@children) {
3059 my $w = pop @children;
3060 push @children, $w->children;
3061 $w->set_invisible;
3062 }
2750} 3063}
2751 3064
2752sub on_refresh { 3065sub on_refresh {
2753 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
2754 3067
2755 $self->{refresh_hook}{$id} = $cb; 3068 $self->{refresh_hook}{$id} = $cb;
2756} 3069}
2757 3070
3071sub on_post_alloc {
3072 my ($self, $id, $cb) = @_;
3073
3074 $self->{post_alloc_hook}{$id} = $cb;
3075}
3076
2758sub draw { 3077sub draw {
2759 my ($self) = @_; 3078 my ($self) = @_;
3079
3080 while ($self->{refresh_hook}) {
3081 $_->()
3082 for values %{delete $self->{refresh_hook}};
3083 }
2760 3084
2761 if ($self->{check_size}) { 3085 if ($self->{check_size}) {
2762 my @queue = ([], []); 3086 my @queue = ([], []);
2763 3087
2764 for (;;) { 3088 for (;;) {
… …
2772 3096
2773 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2774 ? @$widget{qw(user_w user_h)} 3098 ? @$widget{qw(user_w user_h)}
2775 : $widget->size_request; 3099 : $widget->size_request;
2776 3100
3101 if (delete $widget->{force_alloc}
2777 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104
2778 $widget->{req_w} = $w; 3105 $widget->{req_w} = $w;
2779 $widget->{req_h} = $h; 3106 $widget->{req_h} = $h;
2780 3107
2781 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2782 3109
2783 $widget->{parent}->check_size 3110 $widget->{parent}->check_size
2784 if $widget->{parent}; 3111 if $widget->{parent};
2785 } 3112 }
2786 } 3113 }
… …
2788 3115
2789 while ($self->{size_alloc}) { 3116 while ($self->{size_alloc}) {
2790 for (values %{delete $self->{size_alloc}}) { 3117 for (values %{delete $self->{size_alloc}}) {
2791 my ($widget, $w, $h) = @$_; 3118 my ($widget, $w, $h) = @$_;
2792 3119
3120 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0;
3122
2793 $widget->{w} = $w; 3123 $widget->{w} = $w;
2794 $widget->{h} = $h; 3124 $widget->{h} = $h;
2795 $widget->size_allocate ($w, $h);
2796 $widget->emit (size_allocate => $w, $h); 3125 $widget->emit (size_allocate => $w, $h);
2797 } 3126 }
2798 } 3127 }
2799 3128
2800 while ($self->{refresh_hook}) { 3129 while ($self->{post_alloc_hook}) {
2801 $_->() 3130 $_->()
2802 for values %{delete $self->{refresh_hook}}; 3131 for values %{delete $self->{post_alloc_hook}};
2803 } 3132 }
2804 3133
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3134 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 3136 glClear GL_COLOR_BUFFER_BIT;
2808 3137
2809 glMatrixMode GL_PROJECTION; 3138 glMatrixMode GL_PROJECTION;
2810 glLoadIdentity; 3139 glLoadIdentity;
2811 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812 glMatrixMode GL_MODELVIEW; 3141 glMatrixMode GL_MODELVIEW;
2813 glLoadIdentity; 3142 glLoadIdentity;
2814 3143
2815 $self->_draw; 3144 $self->_draw;
2816} 3145}
… …
2818############################################################################# 3147#############################################################################
2819 3148
2820package CFClient::UI; 3149package CFClient::UI;
2821 3150
2822$ROOT = new CFClient::UI::Root; 3151$ROOT = new CFClient::UI::Root;
2823$TOOLTIP = new CFClient::UI::Tooltip; 3152$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824 3153
28251 31541
2826 3155

Diff Legend

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