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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.236 by root, Thu May 25 16:54:29 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
136 $rem += $_ - $i; 130 $rem += $_ - $i;
137 $_ = $i; 131 $_ = $i;
138 } 132 }
139} 133}
140 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
141# call when resolution changes etc. 151# call when resolution changes etc.
142sub rescale_widgets { 152sub rescale_widgets {
143 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
144 154
145 for my $widget (values %WIDGET) { 155 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
147 $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};
148 $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};
149 $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};
150 $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};
151 $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};
152 $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};
153 $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};
154 $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};
155 } 165 }
156
157 $widget->reconfigure;
158 } 166 }
167
168 reconfigure_widgets;
159} 169}
160 170
161############################################################################# 171#############################################################################
162 172
163package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
195 %$self = (); 205 %$self = ();
196} 206}
197 207
198sub show { 208sub show {
199 my ($self) = @_; 209 my ($self) = @_;
200
201 return if $self->{parent}; 210 return if $self->{parent};
202 211
203 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
204} 213}
205 214
206sub hide { 215sub show_centered {
207 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};
208 234
209 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
210 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;
211 248
212 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
213 if $self->{parent}; 250 if $self->{parent};
214} 251}
215 252
… …
282 319
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 322}
286 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
287# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
288sub coord2local { 341sub coord2local {
289 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
290 343
291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
… …
304 return if $FOCUS == $self; 357 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
306 359
307 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
308 361
309 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
310 363
311 $focus->update if $focus; 364 $focus->update if $focus;
312 $FOCUS->update; 365 $FOCUS->update;
313} 366}
314 367
… …
317 370
318 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
319 372
320 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
321 374
322 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
323 376
324 $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;
325} 381}
326 382
327sub mouse_motion { } 383sub mouse_motion { }
328sub button_up { } 384sub button_up { }
329sub key_down { } 385sub key_down { }
330sub key_up { } 386sub key_up { }
331 387
332sub button_down { 388sub button_down {
333 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
334 390
335 $self->focus_in; 391 $self->focus_in;
… …
369 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix; 426 glPushMatrix;
371 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 430 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
378 glEnd; 434 glEnd;
379 glPopMatrix; 435 glPopMatrix;
380 #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;
381 } 437 }
382} 438}
… …
405 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
406 462
407 # TODO: req_w _does_change after ->reconfigure 463 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size 464 $self->check_size
409 unless exists $self->{req_w}; 465 unless exists $self->{req_w};
466
467 $self->show;
410} 468}
411 469
412sub check_size { 470sub check_size {
413 my ($self, $forced) = @_; 471 my ($self, $forced) = @_;
414 472
… …
427 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
428 486
429 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
430} 488}
431 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
432sub emit { 496sub emit {
433 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
434 498
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
436} 501}
437 502
438sub DESTROY { 503sub DESTROY {
439 my ($self) = @_; 504 my ($self) = @_;
440 505
… …
455 my $class = shift; 520 my $class = shift;
456 521
457 # range [value, low, high, page] 522 # range [value, low, high, page]
458 523
459 $class->SUPER::new ( 524 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
462 @_ 527 @_
463 ) 528 )
464} 529}
465 530
466sub _draw { 531sub _draw {
467 my ($self) = @_; 532 my ($self) = @_;
468 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
470 540
471 glEnable GL_BLEND; 541 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
474 544
475 glBegin GL_QUADS; 545 glBegin GL_QUADS;
476 glVertex 0 , 0; 546 glVertex 0 , 0;
477 glVertex 0 , $h; 547 glVertex 0 , $h;
478 glVertex $w, $h; 548 glVertex $w, $h;
479 glVertex $w, 0; 549 glVertex $w, 0;
480 glEnd; 550 glEnd;
481 551
482 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
483} 554}
484 555
485############################################################################# 556#############################################################################
486 557
487package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
547 delete $child->{parent}; 618 delete $child->{parent};
548 $child->hide; 619 $child->hide;
549 620
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 622
552 $self->check_size; 623 $self->check_size (1);
553 $self->update; 624 $self->update;
554} 625}
555 626
556sub clear { 627sub clear {
557 my ($self) = @_; 628 my ($self) = @_;
… …
671 $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 {
672 glClearColor 0, 0, 0, 0; 743 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 744 glClear GL_COLOR_BUFFER_BIT;
674 745
675 $self->_render; 746 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 747 };
684} 748}
685 749
686sub _draw { 750sub _draw {
687 my ($self) = @_; 751 my ($self) = @_;
… …
691 my $tex = $self->{texture} 755 my $tex = $self->{texture}
692 or return; 756 or return;
693 757
694 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 760 glColor 1, 1, 1, 1;
697 761
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 763
700 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
701} 765}
… …
704 768
705package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
706 770
707our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
708 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
709sub size_request { 783sub size_request {
710 my ($self) = @_; 784 my ($self) = @_;
711 785
712 @$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)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 787
715 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
716} 789}
717 790
718sub size_allocate { 791sub size_allocate {
719 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
720 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);
721 $self->update; 798 $self->update;
722} 799}
723 800
724sub set_offset { 801sub set_offset {
725 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
779 856
780 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
781 vertical => 1, 858 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 860 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
785 }, 862 },
786 ; 863 ;
787 864
788 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 866 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 867 slider => $slider,
791 @_, 868 @_,
792 ); 869 );
793 870
794 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 872 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
797 874
798 $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]);
799} 885}
800 886
801#TODO# update range on size_allocate depending on child 887#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 888# update viewport offset on scroll
803 889
… …
857 my $class = shift; 943 my $class = shift;
858 944
859 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
860 946
861 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
864 border => 0.6, 950 border => 0.6,
865 toplevel => 1, 951 is_toplevel => 1,
866 can_events => 1, 952 can_events => 1,
867 @_ 953 @_
868 ); 954 );
869 955
870 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 957 align => 0,
… …
1011sub new { 1097sub new {
1012 my $class = shift; 1098 my $class = shift;
1013 1099
1014 $class->SUPER::new ( 1100 $class->SUPER::new (
1015 col_expand => [], 1101 col_expand => [],
1016 @_ 1102 @_,
1017 ) 1103 )
1104}
1105
1106sub children {
1107 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1108}
1019 1109
1020sub add { 1110sub add {
1021 my ($self, $x, $y, $child) = @_; 1111 my ($self, $x, $y, $child) = @_;
1022 1112
1023 $child->set_parent ($self); 1113 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1114 $self->{children}[$y][$x] = $child;
1025 1115
1026 $child->check_size; 1116 $self->check_size (1);
1027} 1117}
1028 1118
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# 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?
1034sub clear { 1120sub clear {
1035 my ($self) = @_; 1121 my ($self) = @_;
1036 1122
1037 my @children = $self->children; 1123 my @children = $self->children;
1038 delete $self->{children}; 1124 delete $self->{children};
… …
1040 for (@children) { 1126 for (@children) {
1041 delete $_->{parent}; 1127 delete $_->{parent};
1042 $_->hide; 1128 $_->hide;
1043 } 1129 }
1044 1130
1131 $self->check_size (1);
1045 $self->update; 1132 $self->update;
1046} 1133}
1047 1134
1048sub get_wh { 1135sub get_wh {
1049 my ($self) = @_; 1136 my ($self) = @_;
… …
1266 1353
1267############################################################################# 1354#############################################################################
1268 1355
1269package CFClient::UI::Label; 1356package CFClient::UI::Label;
1270 1357
1271our @ISA = CFClient::UI::Base::; 1358our @ISA = CFClient::UI::DrawBG::;
1272 1359
1273use CFClient::OpenGL; 1360use CFClient::OpenGL;
1274 1361
1275sub new { 1362sub new {
1276 my ($class, %arg) = @_; 1363 my ($class, %arg) = @_;
1277 1364
1278 my $self = $class->SUPER::new ( 1365 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1366 fg => [1, 1, 1],
1367 #bg => none
1368 #active_bg => none
1280 #font => default_font 1369 #font => default_font
1281 #text => initial text 1370 #text => initial text
1282 #markup => initial narkup 1371 #markup => initial narkup
1372 #max_w => maximum pixel width
1373 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1374 layout => (new CFClient::Layout),
1284 fontsize => 1, 1375 fontsize => 1,
1285 align => -1, 1376 align => -1,
1286 valign => -1, 1377 valign => -1,
1287 padding => 2, 1378 padding => 2,
… …
1302 } 1393 }
1303 1394
1304 $self 1395 $self
1305} 1396}
1306 1397
1307sub escape { 1398sub escape($) {
1308 local $_ = $_[1]; 1399 local $_ = $_[0];
1309 1400
1310 s/&/&amp;/g; 1401 s/&/&amp;/g;
1311 s/>/&gt;/g; 1402 s/>/&gt;/g;
1312 s/</&lt;/g; 1403 s/</&lt;/g;
1313 1404
1314 $_[1] 1405 $_
1315} 1406}
1316 1407
1317sub update { 1408sub update {
1318 my ($self) = @_; 1409 my ($self) = @_;
1319 1410
… …
1352sub size_request { 1443sub size_request {
1353 my ($self) = @_; 1444 my ($self) = @_;
1354 1445
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1446 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $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});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1450 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1451
1359 my ($w, $h) = $self->{layout}->size; 1452 my ($w, $h) = $self->{layout}->size;
1360 1453
1361 if (exists $self->{template}) { 1454 if (exists $self->{template}) {
… …
1391} 1484}
1392 1485
1393sub _draw { 1486sub _draw {
1394 my ($self) = @_; 1487 my ($self) = @_;
1395 1488
1489 $self->SUPER::_draw; # draw background, if applicable
1490
1396 my $tex = $self->{texture} ||= do { 1491 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1492 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $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});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1498
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1499 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1500
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1501 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1502 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1443 active_fg => [0, 0, 0], 1540 active_fg => [0, 0, 0],
1444 can_hover => 1, 1541 can_hover => 1,
1445 can_focus => 1, 1542 can_focus => 1,
1446 valign => 0, 1543 valign => 0,
1447 can_events => 1, 1544 can_events => 1,
1545 #text => ...
1448 @_ 1546 @_
1449 ) 1547 )
1450} 1548}
1451 1549
1452sub _set_text { 1550sub _set_text {
… …
1462 $self->{text} = $text; 1560 $self->{text} = $text;
1463 1561
1464 $text =~ s/./*/g if $self->{hidden}; 1562 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1563 $self->{layout}->set_text ("$text ");
1466 1564
1467 $self->emit (changed => $self->{text}); 1565 $self->_emit (changed => $self->{text});
1468} 1566}
1469 1567
1470sub set_text { 1568sub set_text {
1471 my ($self, $text) = @_; 1569 my ($self, $text) = @_;
1472 1570
… …
1484 my ($self) = @_; 1582 my ($self) = @_;
1485 1583
1486 my ($w, $h) = $self->SUPER::size_request; 1584 my ($w, $h) = $self->SUPER::size_request;
1487 1585
1488 ($w + 1, $h) # add 1 for cursor 1586 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1587}
1496 1588
1497sub key_down { 1589sub key_down {
1498 my ($self, $ev) = @_; 1590 my ($self, $ev) = @_;
1499 1591
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1606 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1607 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1608 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1609 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1610 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1611 $self->_emit ('escape');
1520 } elsif ($uni) { 1612 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1613 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1614 }
1523 1615
1524 $self->_set_text ($text); 1616 $self->_set_text ($text);
… …
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) = @_;
… …
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 => .05, 2125 inner_pad => 0.02,
2030 @_ 2126 @_
2031 ); 2127 );
2032 2128
2033 $self->set_value ($self->{range}[0]); 2129 $self->set_value ($self->{range}[0]);
2034 $self->update; 2130 $self->update;
2035 2131
2036 $self 2132 $self
2037} 2133}
2038 2134
2135sub set_range {
2136 my ($self, $range) = @_;
2137
2138 $self->{range} = $range;
2139
2140 $self->update;
2141}
2142
2039sub set_value { 2143sub set_value {
2040 my ($self, $value) = @_; 2144 my ($self, $value) = @_;
2041 2145
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2146 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043 2147
2044 $hi = $lo + 1 if $hi <= $lo; 2148 $hi = $lo + 1 if $hi <= $lo;
2045 2149
2150 $page = $hi - $lo if $page > $hi - $lo;
2151
2046 $value = $lo if $value < $lo; 2152 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi; 2153 $value = $hi - $page if $value > $hi - $page;
2048 2154
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2155 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit; 2156 if $unit;
2051 2157
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2158 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055 2159
2056 if ($value != $old_value) { 2160 if ($value != $old_value) {
2057 $self->emit (changed => $value); 2161 $self->_emit (changed => $value);
2058 $self->update; 2162 $self->update;
2059 } 2163 }
2060} 2164}
2061 2165
2062sub size_request { 2166sub size_request {
… …
2070 2174
2071sub button_down { 2175sub button_down {
2072 my ($self, $ev, $x, $y) = @_; 2176 my ($self, $ev, $x, $y) = @_;
2073 2177
2074 $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
2075 $self->mouse_motion ($ev, $x, $y); 2182 $self->mouse_motion ($ev, $x, $y);
2076} 2183}
2077 2184
2078sub mouse_motion { 2185sub mouse_motion {
2079 my ($self, $ev, $x, $y) = @_; 2186 my ($self, $ev, $x, $y) = @_;
… …
2081 if ($GRAB == $self) { 2188 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2189 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083 2190
2084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2191 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085 2192
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087 2194
2088 $self->set_value ($x * ($hi - $lo) + $lo); 2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089 } 2196 }
2090} 2197}
2091 2198
2092sub update { 2199sub update {
2093 my ($self) = @_; 2200 my ($self) = @_;
2094 2201
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]); 2203 $self->set_value ($self->{range}[0]);
2097 2204
2098 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2205 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100;
2099 2207
2100 my $inner_w = 1 - 2 * $self->{inner_pad}; 2208 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101 2209
2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2210 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2211 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103 2212
2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2213 $value = ($value - $lo) / $range;
2105 $value = $self->{scale} * ($value - $lo); 2214 $value = $value * $self->{scale} + $self->{offset};
2106 2215
2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value; 2216 $self->{knob_x} = $value - $knob_w * 0.5;
2113 $self->{knob_w} = $page; 2217 $self->{knob_w} = $knob_w;
2114 }); 2218 });
2115 2219
2116 $self->SUPER::update; 2220 $self->SUPER::update;
2117} 2221}
2118 2222
… …
2124 glScale $self->{w}, $self->{h}; 2228 glScale $self->{w}, $self->{h};
2125 2229
2126 if ($self->{vertical}) { 2230 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2231 # draw a vertical slider like a rotated horizontal slider
2128 2232
2233 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2234 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2235 }
2132 2236
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2237 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2238 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2239
… …
2142 # draw handle 2246 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2247 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2248
2145 glDisable GL_TEXTURE_2D; 2249 glDisable GL_TEXTURE_2D;
2146} 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 (@_) }
2147 2292
2148############################################################################# 2293#############################################################################
2149 2294
2150package CFClient::UI::TextView; 2295package CFClient::UI::TextView;
2151 2296
… …
2181 2326
2182 $self->{fontsize} = $fontsize; 2327 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2328 $self->reflow;
2184} 2329}
2185 2330
2186sub text_height {
2187 my ($self, $text) = @_;
2188
2189 my $layout = $self->{layout};
2190
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w});
2193 $layout->set_markup ($text);
2194
2195 ($layout->size)[1]
2196}
2197
2198sub reflow {
2199 my ($self) = @_;
2200
2201 $self->{need_reflow}++;
2202 $self->update;
2203}
2204
2205sub size_allocate { 2331sub size_allocate {
2206 my ($self, $w, $h) = @_; 2332 my ($self, $w, $h) = @_;
2207 2333
2208 $self->SUPER::size_allocate ($w, $h); 2334 $self->SUPER::size_allocate ($w, $h);
2209 2335
… …
2212 $self->{layout}->set_width ($self->{children}[0]{w}); 2338 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2339
2214 $self->reflow; 2340 $self->reflow;
2215} 2341}
2216 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
2217sub add_paragraph { 2377sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2378 my ($self, $color, $text, $indent) = @_;
2219 2379
2220 #TODO: intelligently "reformat" paragraph 2380 for my $line (split /\n/, $text) {
2221 2381 my ($w, $h) = $self->text_size ($line);
2222 my $height = $self->text_height ($text);
2223
2224 $self->{height} += $height; 2382 $self->{height} += $h;
2383 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2384 }
2225 2385
2226 push @{$self->{par}}, [$height, $color, $text];
2227
2228 $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]);
2229 $self->{children}[1]->update;
2230} 2387}
2231 2388
2232sub update { 2389sub update {
2233 my ($self) = @_; 2390 my ($self) = @_;
2234 2391
… …
2237 return unless $self->{h} > 0; 2394 return unless $self->{h} > 0;
2238 2395
2239 delete $self->{texture}; 2396 delete $self->{texture};
2240 2397
2241 $ROOT->on_post_alloc ($self, sub { 2398 $ROOT->on_post_alloc ($self, sub {
2399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2400
2242 if (delete $self->{need_reflow}) { 2401 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2402 my $height = 0;
2244 2403
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407
2246 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 }
2247 2419
2248 $self->{height} = $height; 2420 $self->{height} = $height;
2249 2421
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2422 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251 2423
2252 delete $self->{texture}; 2424 delete $self->{texture};
2253 } 2425 }
2254 2426
2255 $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 {
2256 glClearColor 0, 0, 0, 0; 2428 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2429 glClear GL_COLOR_BUFFER_BIT;
2258 2430
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0]; 2431 my $top = int $self->{children}[1]{range}[0];
2263 2432
2264 my $y0 = $top; 2433 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2434 my $y1 = $top + $H;
2266 2435
2267 my $y = 0; 2436 my $y = 0;
2268 2437
2269 my $layout = $self->{layout}; 2438 my $layout = $self->{layout};
2270 2439
2271 $layout->set_font ($self->{font}) if $self->{font}; 2440 $layout->set_font ($self->{font}) if $self->{font};
2272 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
2273 for my $par (@{$self->{par}}) { 2446 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2447 my $h = $par->[1];
2275 2448
2276 if ($y0 < $y + $h && $y < $y1) { 2449 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2450 $layout->set_foreground (@{ $par->[2] });
2451 $layout->set_width ($W - $par->[3]);
2278 $layout->set_markup ($par->[2]); 2452 $layout->set_markup ($par->[4]);
2279 2453
2280 my ($W, $H) = $layout->size; 2454 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 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;
2282 } 2458 }
2283 2459
2284 $y += $h; 2460 $y += $h;
2285 } 2461 }
2286 2462
2287 glDisable GL_TEXTURE_2D; 2463 glDisable GL_BLEND;
2288 }; 2464 };
2289 }); 2465 });
2290} 2466}
2291 2467
2292sub _draw { 2468sub _draw {
2293 my ($self) = @_; 2469 my ($self) = @_;
2294 2470
2295 glEnable GL_TEXTURE_2D; 2471 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2473 glColor 1, 1, 1, 1;
2298 $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});
2299 glDisable GL_TEXTURE_2D; 2475 glDisable GL_TEXTURE_2D;
2300 2476
2301 $self->{children}[1]->draw; 2477 $self->{children}[1]->draw;
2302 2478
2303} 2479}
… …
2372 2548
2373 # TODO: use animation 2549 # TODO: use animation
2374 if ($self->{state} = !$self->{state}) { 2550 if ($self->{state} = !$self->{state}) {
2375 $CFClient::UI::ROOT->add ($self->{other}); 2551 $CFClient::UI::ROOT->add ($self->{other});
2376 $self->{other}->move ($self->coord2global (0, $self->{h})); 2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2377 $self->emit ("open"); 2553 $self->_emit ("open");
2378 } else { 2554 } else {
2379 $CFClient::UI::ROOT->remove ($self->{other}); 2555 $CFClient::UI::ROOT->remove ($self->{other});
2380 $self->emit ("close"); 2556 $self->_emit ("close");
2381 } 2557 }
2382 2558
2383 $self->emit (changed => $self->{state}); 2559 $self->_emit (changed => $self->{state});
2384} 2560}
2385 2561
2386############################################################################# 2562#############################################################################
2387 2563
2388package CFClient::UI::Tooltip; 2564package CFClient::UI::Tooltip;
… …
2402 2578
2403sub set_tooltip_from { 2579sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2580 my ($self, $widget) = @_;
2405 2581
2406 $self->add (new CFClient::UI::Label 2582 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2583 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2584 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2585 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2586 fg => [0, 0, 0, 1],
2587 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2588 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2589 );
2413} 2590}
2414 2591
2415sub size_request { 2592sub size_request {
2416 my ($self) = @_; 2593 my ($self) = @_;
… …
2462use CFClient::OpenGL; 2639use CFClient::OpenGL;
2463 2640
2464sub new { 2641sub new {
2465 my $class = shift; 2642 my $class = shift;
2466 2643
2467 $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2468 aspect => 1, 2645 aspect => 1,
2646 can_events => 0,
2469 @_, 2647 @_,
2470 ) 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
2471} 2665}
2472 2666
2473sub size_request { 2667sub size_request {
2474 (32, 8) 2668 (32, 8)
2475} 2669}
2476 2670
2671sub update {
2672 my ($self) = @_;
2673
2674 return unless $self->{visible};
2675
2676 $self->SUPER::update;
2677}
2678
2477sub _draw { 2679sub _draw {
2478 my ($self) = @_; 2680 my ($self) = @_;
2479 2681
2480 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
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2694
2483 # TODO animation
2484 if ($tex) { 2695 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2696 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2698 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2700 glDisable GL_TEXTURE_2D;
2490 } 2701 }
2491} 2702}
2492 2703
2704sub DESTROY {
2705 my ($self) = @_;
2706
2707 $self->{timer}->cancel
2708 if $self->{timer};
2709
2710 $self->SUPER::DESTROY;
2711}
2712
2493############################################################################# 2713#############################################################################
2494 2714
2495package CFClient::UI::InventoryItem; 2715package CFClient::UI::Inventory;
2496 2716
2497our @ISA = CFClient::UI::HBox::; 2717our @ISA = CFClient::UI::ScrolledWindow::;
2498 2718
2499sub new { 2719sub new {
2500 my $class = shift; 2720 my $class = shift;
2501 2721
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2526 can_hover => 1, 2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_, 2724 @_,
2585 ); 2725 );
2586 2726
2587 $self 2727 $self
2588} 2728}
… …
2598 or ($a->{name} cmp $b->{name}) 2738 or ($a->{name} cmp $b->{name})
2599 } @$items; 2739 } @$items;
2600 2740
2601 $self->{real_items} = \@items; 2741 $self->{real_items} = \@items;
2602 2742
2743 my $row = 0;
2603 for my $item (@items) { 2744 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2 2745 CFClient::Item::update_widgets $item;
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607 2746
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2609 } 2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2610 2750
2611 $self->{scrolled}->add (@items); 2751 $row++;
2752 }
2612 2753
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614} 2755}
2615 2756
2616sub size_request { 2757sub size_request {
… …
2658 2799
2659# 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)
2660sub popup { 2801sub popup {
2661 my ($self, $ev) = @_; 2802 my ($self, $ev) = @_;
2662 2803
2663 $self->emit ("popdown"); 2804 $self->_emit ("popdown");
2664 2805
2665 # maybe save $GRAB? must be careful about events... 2806 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self; 2807 $GRAB = $self;
2667 $self->{button} = $ev->{button}; 2808 $self->{button} = $ev->{button};
2668 2809
… …
2683 2824
2684 if ($ev->{button} == $self->{button}) { 2825 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB; 2826 undef $GRAB;
2686 $self->hide; 2827 $self->hide;
2687 2828
2688 $self->emit ("popdown"); 2829 $self->_emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover}; 2830 $self->{hover}[1]->() if $self->{hover};
2690 } 2831 }
2691} 2832}
2692 2833
2693############################################################################# 2834#############################################################################
2694 2835
2695package CFClient::UI::Statusbox; 2836package CFClient::UI::Statusbox;
2696 2837
2697our @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}
2698 2848
2699sub reorder { 2849sub reorder {
2700 my ($self) = @_; 2850 my ($self) = @_;
2701 my $NOW = time; 2851 my $NOW = time;
2702 2852
… …
2722 : $item->{text}; 2872 : $item->{text};
2723 2873
2724 for ($short) { 2874 for ($short) {
2725 s/^\s+//; 2875 s/^\s+//;
2726 s/\s+/ /g; 2876 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2877 }
2730 2878
2731 new CFClient::UI::Label 2879 new CFClient::UI::Label
2732 markup => $short, 2880 markup => $short,
2733 tooltip => $item->{tooltip}, 2881 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2882 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2883 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2884 fontsize => $item->{fontsize} || $self->{fontsize},
2885 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2886 fg => $item->{fg},
2738 can_events => 1, 2887 can_events => 1,
2739 can_hover => 1 2888 can_hover => 1
2740 }; 2889 };
2741 } 2890 }
… …
2747sub add { 2896sub add {
2748 my ($self, $text, %arg) = @_; 2897 my ($self, $text, %arg) = @_;
2749 2898
2750 $text =~ s/^\s+//; 2899 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//; 2900 $text =~ s/\s+$//;
2901
2902 return unless $text;
2752 2903
2753 my $timeout = time + ((delete $arg{timeout}) || 60); 2904 my $timeout = time + ((delete $arg{timeout}) || 60);
2754 2905
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756 2907
… …
2768 $self->{item}{$group} = { 2919 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2920 id => ++$self->{id},
2770 text => $text, 2921 text => $text,
2771 timeout => $timeout, 2922 timeout => $timeout,
2772 tooltip => $text, 2923 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2924 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2925 pri => 0,
2776 count => 1, 2926 count => 1,
2777 %arg, 2927 %arg,
2778 }; 2928 };
2779 } 2929 }
2780 2930
2781 $self->reorder; 2931 $self->reorder;
2782} 2932}
2783 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
2784############################################################################# 2944#############################################################################
2785 2945
2786package CFClient::UI::Root; 2946package CFClient::UI::Root;
2787 2947
2788our @ISA = CFClient::UI::Container::; 2948our @ISA = CFClient::UI::Container::;
… …
2818} 2978}
2819 2979
2820sub size_allocate { 2980sub size_allocate {
2821 my ($self, $w, $h) = @_; 2981 my ($self, $w, $h) = @_;
2822 2982
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2829 for my $child ($self->children) { 2983 for my $child ($self->children) {
2830 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)};
2831 2985
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833 if exists $child->{req_x}; 2987 if exists $child->{req_x};
… …
2862} 3016}
2863 3017
2864sub add { 3018sub add {
2865 my ($self, @children) = @_; 3019 my ($self, @children) = @_;
2866 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
2867 for my $child (@children) { 3027 for my $child (@children) {
2868 $child->{toplevel} = 1; 3028 $child->{is_toplevel} = 1;
2869 3029
2870 # integerise window positions 3030 # integerise window positions
2871 $child->{x} = int $child->{x}; 3031 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y}; 3032 $child->{y} = int $child->{y};
2873 } 3033 }
2874 3034
2875 $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 }
2876} 3048}
2877 3049
2878sub on_refresh { 3050sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3051 my ($self, $id, $cb) = @_;
2880 3052
… …
2933 $w = 0 if $w < 0; 3105 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0; 3106 $h = 0 if $h < 0;
2935 3107
2936 $widget->{w} = $w; 3108 $widget->{w} = $w;
2937 $widget->{h} = $h; 3109 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h);
2939 $widget->emit (size_allocate => $w, $h); 3110 $widget->emit (size_allocate => $w, $h);
2940 } 3111 }
2941 } 3112 }
2942 3113
2943 while ($self->{post_alloc_hook}) { 3114 while ($self->{post_alloc_hook}) {
… …
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3121 glClear GL_COLOR_BUFFER_BIT;
2951 3122
2952 glMatrixMode GL_PROJECTION; 3123 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3124 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3126 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3127 glLoadIdentity;
2957 3128
2958 $self->_draw; 3129 $self->_draw;
2959} 3130}
… …
2961############################################################################# 3132#############################################################################
2962 3133
2963package CFClient::UI; 3134package CFClient::UI;
2964 3135
2965$ROOT = new CFClient::UI::Root; 3136$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3137$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3138
29681 31391
2969 3140

Diff Legend

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