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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.236 by root, Thu May 25 16:54:29 2006 UTC

… …
31 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 32 $TOOLTIP->show;
33 33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35 35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
39 38
40 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
42 $TOOLTIP->update; 41 $TOOLTIP->update;
43 } 42 }
… …
51 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
52} 51}
53 52
54# class methods for events 53# class methods for events
55sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 56 if $FOCUS;
58} 57}
59 58
60sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 61 if $FOCUS;
63} 62}
64 63
65sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
66 my ($ev) = @_; 65 my ($ev) = @_;
… …
75 check_tooltip; 74 check_tooltip;
76 } 75 }
77 76
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 78
80 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 81}
85 82
86sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
87 my ($ev) = @_; 84 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
89 86
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 88
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 90
94 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 93
99 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 96 $grab->update if $grab;
102 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 114
120 check_tooltip; 115 check_tooltip;
121 } 116 }
122 117
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 119 if $HOVER;
127} 120}
128 121
129# convert position array to integers 122# convert position array to integers
130sub harmonize { 123sub harmonize {
131 my ($vals) = @_; 124 my ($vals) = @_;
… …
137 $rem += $_ - $i; 130 $rem += $_ - $i;
138 $_ = $i; 131 $_ = $i;
139 } 132 }
140} 133}
141 134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
142# call when resolution changes etc. 151# call when resolution changes etc.
143sub rescale_widgets { 152sub rescale_widgets {
144 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
145 154
146 for my $widget (values %WIDGET) { 155 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156 } 165 }
157
158 $widget->reconfigure;
159 } 166 }
167
168 reconfigure_widgets;
160} 169}
161 170
162############################################################################# 171#############################################################################
163 172
164package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
196 %$self = (); 205 %$self = ();
197} 206}
198 207
199sub show { 208sub show {
200 my ($self) = @_; 209 my ($self) = @_;
201
202 return if $self->{parent}; 210 return if $self->{parent};
203 211
204 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
205} 213}
206 214
207sub hide { 215sub show_centered {
208 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
209 234
210 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
212 248
213 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
214 if $self->{parent}; 250 if $self->{parent};
215} 251}
216 252
… …
283 319
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
286} 322}
287 323
324sub set_tooltip {
325 my ($self, $tooltip) = @_;
326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
332 $self->{tooltip} = $tooltip;
333
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip;
337 }
338}
339
288# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
289sub coord2local { 341sub coord2local {
290 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
291 343
292 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
… …
305 return if $FOCUS == $self; 357 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
307 359
308 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
309 361
310 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
311 363
312 $focus->update if $focus; 364 $focus->update if $focus;
313 $FOCUS->update; 365 $FOCUS->update;
314} 366}
315 367
… …
318 370
319 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
320 372
321 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
322 374
323 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
324 376
325 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
326} 381}
327 382
328sub mouse_motion { } 383sub mouse_motion { }
329sub button_up { } 384sub button_up { }
330sub key_down { } 385sub key_down { }
331sub key_up { } 386sub key_up { }
332 387
333sub button_down { 388sub button_down {
334 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
335 390
336 $self->focus_in; 391 $self->focus_in;
… …
370 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
371 glPushMatrix; 426 glPushMatrix;
372 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 430 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
377 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
378 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
379 glEnd; 434 glEnd;
380 glPopMatrix; 435 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 437 }
383} 438}
384 439
385sub _draw { 440sub _draw {
386 my ($self) = @_; 441 my ($self) = @_;
… …
406 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
407 462
408 # TODO: req_w _does_change after ->reconfigure 463 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size 464 $self->check_size
410 unless exists $self->{req_w}; 465 unless exists $self->{req_w};
466
467 $self->show;
411} 468}
412 469
413sub check_size { 470sub check_size {
414 my ($self, $forced) = @_; 471 my ($self, $forced) = @_;
415 472
… …
428 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
429 486
430 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
431} 488}
432 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
433sub emit { 496sub emit {
434 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
435 498
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
437} 501}
438 502
439sub DESTROY { 503sub DESTROY {
440 my ($self) = @_; 504 my ($self) = @_;
441 505
… …
456 my $class = shift; 520 my $class = shift;
457 521
458 # range [value, low, high, page] 522 # range [value, low, high, page]
459 523
460 $class->SUPER::new ( 524 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
463 @_ 527 @_
464 ) 528 )
465} 529}
466 530
467sub _draw { 531sub _draw {
468 my ($self) = @_; 532 my ($self) = @_;
469 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
471 540
472 glEnable GL_BLEND; 541 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
475 544
476 glBegin GL_QUADS; 545 glBegin GL_QUADS;
477 glVertex 0 , 0; 546 glVertex 0 , 0;
478 glVertex 0 , $h; 547 glVertex 0 , $h;
479 glVertex $w, $h; 548 glVertex $w, $h;
480 glVertex $w, 0; 549 glVertex $w, 0;
481 glEnd; 550 glEnd;
482 551
483 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
484} 554}
485 555
486############################################################################# 556#############################################################################
487 557
488package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
548 delete $child->{parent}; 618 delete $child->{parent};
549 $child->hide; 619 $child->hide;
550 620
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 622
553 $self->check_size; 623 $self->check_size (1);
554 $self->update; 624 $self->update;
555} 625}
556 626
557sub clear { 627sub clear {
558 my ($self) = @_; 628 my ($self) = @_;
… …
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 743 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 744 glClear GL_COLOR_BUFFER_BIT;
675 745
676 $self->_render; 746 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 747 };
685} 748}
686 749
687sub _draw { 750sub _draw {
688 my ($self) = @_; 751 my ($self) = @_;
… …
692 my $tex = $self->{texture} 755 my $tex = $self->{texture}
693 or return; 756 or return;
694 757
695 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 760 glColor 1, 1, 1, 1;
698 761
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 763
701 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
702} 765}
… …
705 768
706package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
707 770
708our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
709 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
710sub size_request { 783sub size_request {
711 my ($self) = @_; 784 my ($self) = @_;
712 785
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 787
716 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
717} 789}
718 790
719sub size_allocate { 791sub size_allocate {
720 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
721 793
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
797 $self->child->configure (0, 0, $w, $h);
722 $self->update; 798 $self->update;
723} 799}
724 800
725sub set_offset { 801sub set_offset {
726 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
780 856
781 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
782 vertical => 1, 858 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 860 connect_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
786 }, 862 },
787 ; 863 ;
788 864
789 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 866 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 867 slider => $slider,
792 @_, 868 @_,
793 ); 869 );
794 870
795 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp}); 872 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
798 874
799 $self 875 $self
876}
877
878sub size_allocate {
879 my ($self, $w, $h) = @_;
880
881 $self->SUPER::size_allocate ($w, $h);
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800} 885}
801 886
802#TODO# update range on size_allocate depending on child 887#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 888# update viewport offset on scroll
804 889
… …
858 my $class = shift; 943 my $class = shift;
859 944
860 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
861 946
862 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
865 border => 0.6, 950 border => 0.6,
866 toplevel => 1, 951 is_toplevel => 1,
867 can_events => 1, 952 can_events => 1,
868 @_ 953 @_
869 ); 954 );
870 955
871 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
872 align => 0, 957 align => 0,
… …
896 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
897 982
898 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
900 985
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902 if $self->{title}; 987 if $self->{title};
903 988
904 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
905} 990}
906 991
… …
1012sub new { 1097sub new {
1013 my $class = shift; 1098 my $class = shift;
1014 1099
1015 $class->SUPER::new ( 1100 $class->SUPER::new (
1016 col_expand => [], 1101 col_expand => [],
1017 @_ 1102 @_,
1018 ) 1103 )
1104}
1105
1106sub children {
1107 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1108}
1020 1109
1021sub add { 1110sub add {
1022 my ($self, $x, $y, $child) = @_; 1111 my ($self, $x, $y, $child) = @_;
1023 1112
1024 $child->set_parent ($self); 1113 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1114 $self->{children}[$y][$x] = $child;
1026 1115
1027 $child->check_size; 1116 $self->check_size (1);
1028} 1117}
1029 1118
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# TODO: move to container class maybe? send childs a signal on removal? 1119# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1120sub clear {
1036 my ($self) = @_; 1121 my ($self) = @_;
1037 1122
1038 my @children = $self->children; 1123 my @children = $self->children;
1039 delete $self->{children}; 1124 delete $self->{children};
… …
1041 for (@children) { 1126 for (@children) {
1042 delete $_->{parent}; 1127 delete $_->{parent};
1043 $_->hide; 1128 $_->hide;
1044 } 1129 }
1045 1130
1131 $self->check_size (1);
1046 $self->update; 1132 $self->update;
1047} 1133}
1048 1134
1049sub get_wh { 1135sub get_wh {
1050 my ($self) = @_; 1136 my ($self) = @_;
… …
1267 1353
1268############################################################################# 1354#############################################################################
1269 1355
1270package CFClient::UI::Label; 1356package CFClient::UI::Label;
1271 1357
1272our @ISA = CFClient::UI::Base::; 1358our @ISA = CFClient::UI::DrawBG::;
1273 1359
1274use CFClient::OpenGL; 1360use CFClient::OpenGL;
1275 1361
1276sub new { 1362sub new {
1277 my ($class, %arg) = @_; 1363 my ($class, %arg) = @_;
1278 1364
1279 my $self = $class->SUPER::new ( 1365 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1366 fg => [1, 1, 1],
1367 #bg => none
1368 #active_bg => none
1281 #font => default_font 1369 #font => default_font
1282 #text => initial text 1370 #text => initial text
1283 #markup => initial narkup 1371 #markup => initial narkup
1372 #max_w => maximum pixel width
1373 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1374 layout => (new CFClient::Layout),
1285 fontsize => 1, 1375 fontsize => 1,
1286 align => -1, 1376 align => -1,
1287 valign => -1, 1377 valign => -1,
1288 padding => 2, 1378 padding => 2,
… …
1303 } 1393 }
1304 1394
1305 $self 1395 $self
1306} 1396}
1307 1397
1308sub escape { 1398sub escape($) {
1309 local $_ = $_[1]; 1399 local $_ = $_[0];
1310 1400
1311 s/&/&amp;/g; 1401 s/&/&amp;/g;
1312 s/>/&gt;/g; 1402 s/>/&gt;/g;
1313 s/</&lt;/g; 1403 s/</&lt;/g;
1314 1404
1315 $_[1] 1405 $_
1316} 1406}
1317 1407
1318sub update { 1408sub update {
1319 my ($self) = @_; 1409 my ($self) = @_;
1320 1410
… …
1353sub size_request { 1443sub size_request {
1354 my ($self) = @_; 1444 my ($self) = @_;
1355 1445
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1446 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1447 $self->{layout}->set_width ($self->{max_w} || -1);
1448 $self->{layout}->set_ellipsise ($self->{ellipsise});
1449 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1450 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1451
1360 my ($w, $h) = $self->{layout}->size; 1452 my ($w, $h) = $self->{layout}->size;
1361 1453
1362 if (exists $self->{template}) { 1454 if (exists $self->{template}) {
… …
1392} 1484}
1393 1485
1394sub _draw { 1486sub _draw {
1395 my ($self) = @_; 1487 my ($self) = @_;
1396 1488
1489 $self->SUPER::_draw; # draw background, if applicable
1490
1397 my $tex = $self->{texture} ||= do { 1491 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1492 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1494 $self->{layout}->set_width ($self->{w});
1495 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1498
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1499 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1500
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1501 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1502 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1503 : ($self->{w} - $tex->{w}) * 0.5);
1408 1504
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1505 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1506 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1507 : ($self->{h} - $tex->{h}) * 0.5);
1412 1508
1413 $tex 1509 $tex
1414 }; 1510 };
1415 1511
1416 glEnable GL_TEXTURE_2D; 1512 glEnable GL_TEXTURE_2D;
… …
1444 active_fg => [0, 0, 0], 1540 active_fg => [0, 0, 0],
1445 can_hover => 1, 1541 can_hover => 1,
1446 can_focus => 1, 1542 can_focus => 1,
1447 valign => 0, 1543 valign => 0,
1448 can_events => 1, 1544 can_events => 1,
1545 #text => ...
1449 @_ 1546 @_
1450 ) 1547 )
1451} 1548}
1452 1549
1453sub _set_text { 1550sub _set_text {
… …
1463 $self->{text} = $text; 1560 $self->{text} = $text;
1464 1561
1465 $text =~ s/./*/g if $self->{hidden}; 1562 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1563 $self->{layout}->set_text ("$text ");
1467 1564
1468 $self->emit (changed => $self->{text}); 1565 $self->_emit (changed => $self->{text});
1469} 1566}
1470 1567
1471sub set_text { 1568sub set_text {
1472 my ($self, $text) = @_; 1569 my ($self, $text) = @_;
1473 1570
1474 $self->{cursor} = length $text; 1571 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1572 $self->_set_text ($text);
1573 $self->update;
1476 $self->check_size; 1574 $self->check_size;
1477 $self->update;
1478} 1575}
1479 1576
1480sub get_text { 1577sub get_text {
1481 $_[0]{text} 1578 $_[0]{text}
1482} 1579}
… …
1485 my ($self) = @_; 1582 my ($self) = @_;
1486 1583
1487 my ($w, $h) = $self->SUPER::size_request; 1584 my ($w, $h) = $self->SUPER::size_request;
1488 1585
1489 ($w + 1, $h) # add 1 for cursor 1586 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1587}
1497 1588
1498sub key_down { 1589sub key_down {
1499 my ($self, $ev) = @_; 1590 my ($self, $ev) = @_;
1500 1591
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1606 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1607 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1608 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1609 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1610 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1611 $self->_emit ('escape');
1521 } elsif ($uni) { 1612 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1613 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1614 }
1524 1615
1525 $self->_set_text ($text); 1616 $self->_set_text ($text);
1526 $self->update; 1617 $self->update;
1618 $self->check_size;
1527} 1619}
1528 1620
1529sub focus_in { 1621sub focus_in {
1530 my ($self) = @_; 1622 my ($self) = @_;
1531 1623
… …
1611 if ($sym == 13) { 1703 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1704 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1705 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1706 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1707 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1708 $self->_emit (activate => $txt);
1617 $self->update; 1709 $self->update;
1618 1710
1619 } elsif ($sym == CFClient::SDLK_UP) { 1711 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1712 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1713 $self->{history_saveback} = $self->get_text;
… …
1660 my $class = shift; 1752 my $class = shift;
1661 1753
1662 $class->SUPER::new ( 1754 $class->SUPER::new (
1663 padding => 4, 1755 padding => 4,
1664 fg => [1, 1, 1], 1756 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1757 active_fg => [0, 0, 1],
1667 can_hover => 1, 1758 can_hover => 1,
1668 align => 0, 1759 align => 0,
1669 valign => 0, 1760 valign => 0,
1670 can_events => 1, 1761 can_events => 1,
1671 @_ 1762 @_
1672 ) 1763 )
1673} 1764}
1674 1765
1766sub activate { }
1767
1675sub button_up { 1768sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1769 my ($self, $ev, $x, $y) = @_;
1677 1770
1771 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1772 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1773 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1774}
1683 1775
1684sub _draw { 1776sub _draw {
1685 my ($self) = @_; 1777 my ($self) = @_;
1686 1778
… …
1718 1810
1719 $class->SUPER::new ( 1811 $class->SUPER::new (
1720 padding => 2, 1812 padding => 2,
1721 fg => [1, 1, 1], 1813 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1814 active_fg => [1, 1, 0],
1815 bg => [0, 0, 0, 0.2],
1816 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1817 state => 0,
1724 can_hover => 1, 1818 can_hover => 1,
1725 @_ 1819 @_
1726 ) 1820 )
1727} 1821}
… …
1736 my ($self, $ev, $x, $y) = @_; 1830 my ($self, $ev, $x, $y) = @_;
1737 1831
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740 $self->{state} = !$self->{state}; 1834 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1835 $self->_emit (changed => $self->{state});
1742 } 1836 }
1743} 1837}
1744 1838
1745sub _draw { 1839sub _draw {
1746 my ($self) = @_; 1840 my ($self) = @_;
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2105 qw(s1_slider.png s1_slider_bg.png);
2012 2106
2013sub new { 2107sub new {
2014 my $class = shift; 2108 my $class = shift;
2015 2109
2016 # range [value, low, high, page] 2110 # range [value, low, high, page, unit]
2017 2111
2018 # TODO: 0-width page 2112 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2113 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2114 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2115 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2116 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2117 active_fg => [0, 0, 0],
2118 bg => [0, 0, 0, 0.2],
2119 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2120 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2121 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2122 req_h => $::WIDTH / 80,
2027 vertical => 0, 2123 vertical => 0,
2028 can_hover => 1, 2124 can_hover => 1,
2029 inner_pad => 5, 2125 inner_pad => 0.02,
2030 @_ 2126 @_
2031 ); 2127 );
2032 2128
2129 $self->set_value ($self->{range}[0]);
2130 $self->update;
2131
2033 $self 2132 $self
2133}
2134
2135sub set_range {
2136 my ($self, $range) = @_;
2137
2138 $self->{range} = $range;
2139
2140 $self->update;
2141}
2142
2143sub set_value {
2144 my ($self, $value) = @_;
2145
2146 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2147
2148 $hi = $lo + 1 if $hi <= $lo;
2149
2150 $page = $hi - $lo if $page > $hi - $lo;
2151
2152 $value = $lo if $value < $lo;
2153 $value = $hi - $page if $value > $hi - $page;
2154
2155 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2156 if $unit;
2157
2158 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2159
2160 if ($value != $old_value) {
2161 $self->_emit (changed => $value);
2162 $self->update;
2163 }
2034} 2164}
2035 2165
2036sub size_request { 2166sub size_request {
2037 my ($self) = @_; 2167 my ($self) = @_;
2038 2168
… …
2044 2174
2045sub button_down { 2175sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2176 my ($self, $ev, $x, $y) = @_;
2047 2177
2048 $self->SUPER::button_down ($ev, $x, $y); 2178 $self->SUPER::button_down ($ev, $x, $y);
2179
2180 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181
2049 $self->mouse_motion ($ev, $x, $y); 2182 $self->mouse_motion ($ev, $x, $y);
2050} 2183}
2051 2184
2052sub mouse_motion { 2185sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2186 my ($self, $ev, $x, $y) = @_;
2054 2187
2055 if ($GRAB == $self) { 2188 if ($GRAB == $self) {
2189 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2190
2191 my (undef, $lo, $hi, $page) = @{$self->{range}};
2192
2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2194
2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2196 }
2197}
2198
2199sub update {
2200 my ($self) = @_;
2201
2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2203 $self->set_value ($self->{range}[0]);
2204
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2205 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100;
2057 2207
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2208 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2209
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2210 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2211 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2212
2063 $x -= $inner_pad_px; # substract the padding 2213 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2214 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2215
2069 $self->emit (changed => $x); 2216 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2217 $self->{knob_w} = $knob_w;
2071 } 2218 });
2072}
2073 2219
2074# the inner_* stuff is for generating a padding for the slider handle, 2220 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2221}
2081 2222
2082sub _draw { 2223sub _draw {
2083 my ($self) = @_; 2224 my ($self) = @_;
2084 2225
2085 $self->SUPER::_draw (); 2226 $self->SUPER::_draw ();
2086 2227
2087 my ($w, $h) = @$self{qw(w h)}; 2228 glScale $self->{w}, $self->{h};
2088 2229
2089 if ($self->{vertical}) { 2230 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2231 # draw a vertical slider like a rotated horizontal slider
2091 2232
2233 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2234 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2235 }
2097 2236
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2237 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2238 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2239
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2240 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2242
2122 # draw background 2243 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2244 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2245
2125 # draw handle 2246 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2247 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2248
2128 glDisable GL_TEXTURE_2D; 2249 glDisable GL_TEXTURE_2D;
2129} 2250}
2251
2252#############################################################################
2253
2254package CFClient::UI::ValSlider;
2255
2256our @ISA = CFClient::UI::HBox::;
2257
2258sub new {
2259 my ($class, %arg) = @_;
2260
2261 my $range = delete $arg{range};
2262
2263 my $self = $class->SUPER::new (
2264 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2265 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2266 to_value => sub { shift },
2267 from_value => sub { shift },
2268 %arg,
2269 );
2270
2271 $self->{slider}->connect (changed => sub {
2272 my ($self, $value) = @_;
2273 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2274 $self->{parent}->emit (changed => $value);
2275 });
2276
2277# $self->{entry}->connect (changed => sub {
2278# my ($self, $value) = @_;
2279# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2280# $self->{parent}->emit (changed => $value);
2281# });
2282
2283 $self->add ($self->{slider}, $self->{entry});
2284
2285 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2286
2287 $self
2288}
2289
2290sub set_range { shift->{slider}->set_range (@_) }
2291sub set_value { shift->{slider}->set_value (@_) }
2130 2292
2131############################################################################# 2293#############################################################################
2132 2294
2133package CFClient::UI::TextView; 2295package CFClient::UI::TextView;
2134 2296
… …
2164 2326
2165 $self->{fontsize} = $fontsize; 2327 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2328 $self->reflow;
2167} 2329}
2168 2330
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2331sub size_allocate {
2189 my ($self, $w, $h) = @_; 2332 my ($self, $w, $h) = @_;
2190 2333
2191 $self->SUPER::size_allocate ($w, $h); 2334 $self->SUPER::size_allocate ($w, $h);
2192 2335
… …
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2338 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2339
2197 $self->reflow; 2340 $self->reflow;
2198} 2341}
2199 2342
2343sub text_size {
2344 my ($self, $text, $indent) = @_;
2345
2346 my $layout = $self->{layout};
2347
2348 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2349 $layout->set_width ($self->{children}[0]{w} - $indent);
2350 $layout->set_markup ($text);
2351
2352 $layout->size
2353}
2354
2355sub reflow {
2356 my ($self) = @_;
2357
2358 $self->{need_reflow}++;
2359 $self->update;
2360}
2361
2362sub set_offset {
2363 my ($self, $offset) = @_;
2364
2365 # todo: base offset on lines or so, not on pixels
2366 $self->{children}[1]->set_value ($offset);
2367}
2368
2369sub clear {
2370 my ($self) = @_;
2371
2372 $self->{par} = [];
2373 $self->{height} = 0;
2374 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2375}
2376
2200sub add_paragraph { 2377sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2378 my ($self, $color, $text, $indent) = @_;
2202 2379
2203 #TODO: intelligently "reformat" paragraph 2380 for my $line (split /\n/, $text) {
2204 2381 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2382 $self->{height} += $h;
2383 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2384 }
2208 2385
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2386 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212 $self->{children}[1]->update;
2213} 2387}
2214 2388
2215sub update { 2389sub update {
2216 my ($self) = @_; 2390 my ($self) = @_;
2217 2391
… …
2220 return unless $self->{h} > 0; 2394 return unless $self->{h} > 0;
2221 2395
2222 delete $self->{texture}; 2396 delete $self->{texture};
2223 2397
2224 $ROOT->on_post_alloc ($self, sub { 2398 $ROOT->on_post_alloc ($self, sub {
2399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2400
2225 if (delete $self->{need_reflow}) { 2401 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2402 my $height = 0;
2227 2403
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407
2229 for @{$self->{par}}; 2408 for (@{$self->{par}}) {
2409 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2410 $layout->set_width ($W - $_->[3]);
2411 $layout->set_markup ($_->[4]);
2412 my ($w, $h) = $layout->size;
2413 $_->[0] = $w + $_->[3];
2414 $_->[1] = $h;
2415 }
2416
2417 $height += $_->[1];
2418 }
2230 2419
2231 $self->{height} = $height; 2420 $self->{height} = $height;
2232 2421
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2422 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2423
2235 delete $self->{texture}; 2424 delete $self->{texture};
2236 } 2425 }
2237 2426
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2427 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239 glClearColor 0, 0, 0, 0; 2428 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2429 glClear GL_COLOR_BUFFER_BIT;
2241 2430
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2431 my $top = int $self->{children}[1]{range}[0];
2246 2432
2247 my $y0 = $top; 2433 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2434 my $y1 = $top + $H;
2249 2435
2250 my $y = 0; 2436 my $y = 0;
2251 2437
2252 my $layout = $self->{layout}; 2438 my $layout = $self->{layout};
2253 2439
2254 $layout->set_font ($self->{font}) if $self->{font}; 2440 $layout->set_font ($self->{font}) if $self->{font};
2255 2441
2442 glEnable GL_BLEND;
2443 #TODO# not correct in windows where rgba is forced off
2444 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2445
2256 for my $par (@{$self->{par}}) { 2446 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2447 my $h = $par->[1];
2258 2448
2259 if ($y0 < $y + $h && $y < $y1) { 2449 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2450 $layout->set_foreground (@{ $par->[2] });
2451 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2452 $layout->set_markup ($par->[4]);
2262 2453
2263 my ($W, $H) = $layout->size; 2454 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2455
2456 glRasterPos $par->[3], $y - $y0;
2457 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2458 }
2266 2459
2267 $y += $h; 2460 $y += $h;
2268 } 2461 }
2269 2462
2270 glDisable GL_TEXTURE_2D; 2463 glDisable GL_BLEND;
2271 }; 2464 };
2272 }); 2465 });
2273} 2466}
2274 2467
2275sub _draw { 2468sub _draw {
2276 my ($self) = @_; 2469 my ($self) = @_;
2277 2470
2278 glEnable GL_TEXTURE_2D; 2471 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2473 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2474 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2475 glDisable GL_TEXTURE_2D;
2283 2476
2284 $self->{children}[1]->draw; 2477 $self->{children}[1]->draw;
2285 2478
2286} 2479}
… …
2355 2548
2356 # TODO: use animation 2549 # TODO: use animation
2357 if ($self->{state} = !$self->{state}) { 2550 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other}); 2551 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h})); 2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open"); 2553 $self->_emit ("open");
2361 } else { 2554 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other}); 2555 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close"); 2556 $self->_emit ("close");
2364 } 2557 }
2365 2558
2366 $self->emit (changed => $self->{state}); 2559 $self->_emit (changed => $self->{state});
2367} 2560}
2368 2561
2369############################################################################# 2562#############################################################################
2370 2563
2371package CFClient::UI::Tooltip; 2564package CFClient::UI::Tooltip;
… …
2385 2578
2386sub set_tooltip_from { 2579sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2580 my ($self, $widget) = @_;
2388 2581
2389 $self->add (new CFClient::UI::Label 2582 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2583 markup => $widget->{tooltip},
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2584 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2585 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2586 fg => [0, 0, 0, 1],
2587 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2588 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2589 );
2396} 2590}
2397 2591
2398sub size_request { 2592sub size_request {
2399 my ($self) = @_; 2593 my ($self) = @_;
… …
2445use CFClient::OpenGL; 2639use CFClient::OpenGL;
2446 2640
2447sub new { 2641sub new {
2448 my $class = shift; 2642 my $class = shift;
2449 2643
2450 $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2451 aspect => 1, 2645 aspect => 1,
2646 can_events => 0,
2452 @_, 2647 @_,
2453 ) 2648 );
2649
2650 if ($self->{anim} && $self->{animspeed}) {
2651 Scalar::Util::weaken (my $widget = $self);
2652
2653 $self->{timer} = Event->timer (
2654 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2655 hard => 1,
2656 interval => $self->{animspeed},
2657 cb => sub {
2658 ++$widget->{frame};
2659 $widget->update;
2660 },
2661 );
2662 }
2663
2664 $self
2454} 2665}
2455 2666
2456sub size_request { 2667sub size_request {
2457 (32, 8) 2668 (32, 8)
2458} 2669}
2459 2670
2671sub update {
2672 my ($self) = @_;
2673
2674 return unless $self->{visible};
2675
2676 $self->SUPER::update;
2677}
2678
2460sub _draw { 2679sub _draw {
2461 my ($self) = @_; 2680 my ($self) = @_;
2462 2681
2463 return unless $::CONN;#d# manage and cache textures differently 2682 return unless $::CONN;
2683
2684 my $face;
2685
2686 if ($self->{frame}) {
2687 my $anim = $::CONN->{anim}[$self->{anim}];
2688
2689 $face = $anim->[ $self->{frame} % @$anim ]
2690 if $anim && @$anim;
2691 }
2692
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2694
2466 # TODO animation
2467 if ($tex) { 2695 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2696 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2698 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2700 glDisable GL_TEXTURE_2D;
2473 } 2701 }
2474} 2702}
2475 2703
2704sub DESTROY {
2705 my ($self) = @_;
2706
2707 $self->{timer}->cancel
2708 if $self->{timer};
2709
2710 $self->SUPER::DESTROY;
2711}
2712
2476############################################################################# 2713#############################################################################
2477 2714
2478package CFClient::UI::InventoryItem; 2715package CFClient::UI::Inventory;
2479 2716
2480our @ISA = CFClient::UI::HBox::; 2717our @ISA = CFClient::UI::ScrolledWindow::;
2481 2718
2482sub new { 2719sub new {
2483 my $class = shift; 2720 my $class = shift;
2484 2721
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2495 can_hover => 1, 2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_, 2724 @_,
2554 ); 2725 );
2555 2726
2556 $self 2727 $self
2557} 2728}
… …
2567 or ($a->{name} cmp $b->{name}) 2738 or ($a->{name} cmp $b->{name})
2568 } @$items; 2739 } @$items;
2569 2740
2570 $self->{real_items} = \@items; 2741 $self->{real_items} = \@items;
2571 2742
2743 my $row = 0;
2572 for my $item (@items) { 2744 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2 2745 CFClient::Item::update_widgets $item;
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576 2746
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2578 } 2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2579 2750
2580 $self->{scrolled}->add (@items); 2751 $row++;
2752 }
2581 2753
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583} 2755}
2584 2756
2585sub size_request { 2757sub size_request {
… …
2627 2799
2628# popup given the event (must be a mouse button down event currently) 2800# popup given the event (must be a mouse button down event currently)
2629sub popup { 2801sub popup {
2630 my ($self, $ev) = @_; 2802 my ($self, $ev) = @_;
2631 2803
2632 $self->emit ("popdown"); 2804 $self->_emit ("popdown");
2633 2805
2634 # maybe save $GRAB? must be careful about events... 2806 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2807 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2808 $self->{button} = $ev->{button};
2637 2809
… …
2652 2824
2653 if ($ev->{button} == $self->{button}) { 2825 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2826 undef $GRAB;
2655 $self->hide; 2827 $self->hide;
2656 2828
2657 $self->emit ("popdown"); 2829 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2830 $self->{hover}[1]->() if $self->{hover};
2659 } 2831 }
2660} 2832}
2661 2833
2662############################################################################# 2834#############################################################################
2663 2835
2664package CFClient::UI::Statusbox; 2836package CFClient::UI::Statusbox;
2665 2837
2666our @ISA = CFClient::UI::VBox::; 2838our @ISA = CFClient::UI::VBox::;
2839
2840sub new {
2841 my $class = shift;
2842
2843 $class->SUPER::new (
2844 fontsize => 0.8,
2845 @_,
2846 )
2847}
2667 2848
2668sub reorder { 2849sub reorder {
2669 my ($self) = @_; 2850 my ($self) = @_;
2670 my $NOW = time; 2851 my $NOW = time;
2671 2852
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2871 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2872 : $item->{text};
2692 2873
2693 for ($short) { 2874 for ($short) {
2694 s/^\s+//; 2875 s/^\s+//;
2695 s/\012.*/…/s; 2876 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2877 }
2699 2878
2700 new CFClient::UI::Label 2879 new CFClient::UI::Label
2701 markup => $short, 2880 markup => $short,
2702 tooltip => $item->{tooltip}, 2881 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2882 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2883 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2884 fontsize => $item->{fontsize} || $self->{fontsize},
2885 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2886 fg => $item->{fg},
2707 can_events => 1, 2887 can_events => 1,
2708 can_hover => 1 2888 can_hover => 1
2709 }; 2889 };
2710 } 2890 }
2711 2891
… …
2716sub add { 2896sub add {
2717 my ($self, $text, %arg) = @_; 2897 my ($self, $text, %arg) = @_;
2718 2898
2719 $text =~ s/^\s+//; 2899 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 2900 $text =~ s/\s+$//;
2901
2902 return unless $text;
2721 2903
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 2904 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 2905
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 2907
… …
2737 $self->{item}{$group} = { 2919 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2920 id => ++$self->{id},
2739 text => $text, 2921 text => $text,
2740 timeout => $timeout, 2922 timeout => $timeout,
2741 tooltip => $text, 2923 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2924 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2925 pri => 0,
2745 count => 1, 2926 count => 1,
2746 %arg, 2927 %arg,
2747 }; 2928 };
2748 } 2929 }
2749 2930
2750 $self->reorder; 2931 $self->reorder;
2751} 2932}
2752 2933
2934sub reconfigure {
2935 my ($self) = @_;
2936
2937 delete $_->{label}
2938 for values %{ $self->{item} || {} };
2939
2940 $self->reorder;
2941 $self->SUPER::reconfigure;
2942}
2943
2753############################################################################# 2944#############################################################################
2754 2945
2755package CFClient::UI::Root; 2946package CFClient::UI::Root;
2756 2947
2757our @ISA = CFClient::UI::Container::; 2948our @ISA = CFClient::UI::Container::;
… …
2787} 2978}
2788 2979
2789sub size_allocate { 2980sub size_allocate {
2790 my ($self, $w, $h) = @_; 2981 my ($self, $w, $h) = @_;
2791 2982
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 2983 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 2985
2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2987 if exists $child->{req_x};
2988
2989 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2990 if exists $child->{req_y};
2991
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2992 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2993 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994
2803 $child->configure ($X, $Y, $W, $H); 2995 $child->configure ($X, $Y, $W, $H);
2804 } 2996 }
2805} 2997}
2806 2998
2807sub coord2local { 2999sub coord2local {
… …
2824} 3016}
2825 3017
2826sub add { 3018sub add {
2827 my ($self, @children) = @_; 3019 my ($self, @children) = @_;
2828 3020
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
2829 for my $child (@children) { 3027 for my $child (@children) {
2830 $child->{toplevel} = 1; 3028 $child->{is_toplevel} = 1;
2831 3029
2832 # integerise window positions 3030 # integerise window positions
2833 $child->{x} = int $child->{x}; 3031 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y}; 3032 $child->{y} = int $child->{y};
2835 } 3033 }
2836 3034
2837 $self->SUPER::add (@children); 3035 $self->SUPER::add (@children);
3036}
3037
3038sub remove {
3039 my ($self, @children) = @_;
3040
3041 $self->SUPER::remove (@children);
3042
3043 while (@children) {
3044 my $w = pop @children;
3045 push @children, $w->children;
3046 $w->set_invisible;
3047 }
2838} 3048}
2839 3049
2840sub on_refresh { 3050sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3051 my ($self, $id, $cb) = @_;
2842 3052
… …
2895 $w = 0 if $w < 0; 3105 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3106 $h = 0 if $h < 0;
2897 3107
2898 $widget->{w} = $w; 3108 $widget->{w} = $w;
2899 $widget->{h} = $h; 3109 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h);
2901 $widget->emit (size_allocate => $w, $h); 3110 $widget->emit (size_allocate => $w, $h);
2902 } 3111 }
2903 } 3112 }
2904 3113
2905 while ($self->{post_alloc_hook}) { 3114 while ($self->{post_alloc_hook}) {
… …
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3121 glClear GL_COLOR_BUFFER_BIT;
2913 3122
2914 glMatrixMode GL_PROJECTION; 3123 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3124 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3126 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3127 glLoadIdentity;
2919 3128
2920 $self->_draw; 3129 $self->_draw;
2921} 3130}
… …
2923############################################################################# 3132#############################################################################
2924 3133
2925package CFClient::UI; 3134package CFClient::UI;
2926 3135
2927$ROOT = new CFClient::UI::Root; 3136$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3137$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3138
29301 31391
2931 3140

Diff Legend

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