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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
50 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
51} 52}
52 53
53# class methods for events 54# class methods for events
54sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 57 if $FOCUS;
57} 58}
58 59
59sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 62 if $FOCUS;
62} 63}
63 64
64sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
65 my ($ev) = @_; 66 my ($ev) = @_;
… …
74 check_tooltip; 75 check_tooltip;
75 } 76 }
76 77
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 79
79 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 82}
84 83
85sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
86 my ($ev) = @_; 85 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
88 87
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 89
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 91
93 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 94
98 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 97 $grab->update if $grab;
101 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 115
119 check_tooltip; 116 check_tooltip;
120 } 117 }
121 118
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 120 if $HOVER;
126} 121}
127 122
128# convert position array to integers 123# convert position array to integers
129sub harmonize { 124sub harmonize {
130 my ($vals) = @_; 125 my ($vals) = @_;
… …
136 $rem += $_ - $i; 131 $rem += $_ - $i;
137 $_ = $i; 132 $_ = $i;
138 } 133 }
139} 134}
140 135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
141# call when resolution changes etc. 152# call when resolution changes etc.
142sub rescale_widgets { 153sub rescale_widgets {
143 my ($sx, $sy) = @_; 154 my ($sx, $sy) = @_;
144 155
145 for my $widget (values %WIDGET) { 156 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 157 if ($widget->{is_toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 158 $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}; 159 $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}; 160 $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}; 161 $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}; 162 $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}; 163 $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}; 164 $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}; 165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 } 166 }
156
157 $widget->reconfigure;
158 } 167 }
168
169 reconfigure_widgets;
159} 170}
160 171
161############################################################################# 172#############################################################################
162 173
163package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
195 %$self = (); 206 %$self = ();
196} 207}
197 208
198sub show { 209sub show {
199 my ($self) = @_; 210 my ($self) = @_;
200
201 return if $self->{parent}; 211 return if $self->{parent};
202 212
203 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
204} 214}
205 215
206sub hide { 216sub show_centered {
207 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
208 236
209 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
242
243 $self->focus_out;
244}
245
246sub hide {
247 my ($self) = @_;
248
249 $self->set_invisible;
211 250
212 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
213 if $self->{parent}; 252 if $self->{parent};
214} 253}
215 254
… …
285} 324}
286 325
287sub set_tooltip { 326sub set_tooltip {
288 my ($self, $tooltip) = @_; 327 my ($self, $tooltip) = @_;
289 328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
333
290 $self->{tooltip} = $tooltip; 334 $self->{tooltip} = $tooltip;
291 335
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 337 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip; 338 CFClient::UI::check_tooltip;
… …
315 return if $FOCUS == $self; 359 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
317 361
318 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
319 363
320 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
321 365
322 $focus->update if $focus; 366 $focus->update if $focus;
323 $FOCUS->update; 367 $FOCUS->update;
324} 368}
325 369
… …
328 372
329 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
330 374
331 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
332 376
333 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
334 378
335 $focus->update if $focus; #? 379 $focus->update if $focus; #?
380
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS;
336} 383}
337 384
338sub mouse_motion { } 385sub mouse_motion { }
339sub button_up { } 386sub button_up { }
340sub key_down { } 387sub key_down { }
341sub key_up { } 388sub key_up { }
342 389
343sub button_down { 390sub button_down {
344 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
345 392
346 $self->focus_in; 393 $self->focus_in;
… …
380 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
381 glPushMatrix; 428 glPushMatrix;
382 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 432 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
389 glEnd; 436 glEnd;
390 glPopMatrix; 437 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 439 }
393} 440}
… …
413sub set_parent { 460sub set_parent {
414 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
415 462
416 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
417 464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
418 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size 469 $self->check_size
420 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
471
472 $self->show;
421} 473}
422 474
423sub check_size { 475sub check_size {
424 my ($self, $forced) = @_; 476 my ($self, $forced) = @_;
425 477
… …
438 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
439 491
440 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
441} 493}
442 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
443sub emit { 501sub emit {
444 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
445 503
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
447} 506}
448 507
449sub DESTROY { 508sub DESTROY {
450 my ($self) = @_; 509 my ($self) = @_;
451 510
… …
564 delete $child->{parent}; 623 delete $child->{parent};
565 $child->hide; 624 $child->hide;
566 625
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 627
569 $self->check_size; 628 $self->check_size (1);
570 $self->update; 629 $self->update;
571} 630}
572 631
573sub clear { 632sub clear {
574 my ($self) = @_; 633 my ($self) = @_;
… …
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 747 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 748 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 749 glClear GL_COLOR_BUFFER_BIT;
691 750
692 $self->_render; 751 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 752 };
701} 753}
702 754
703sub _draw { 755sub _draw {
704 my ($self) = @_; 756 my ($self) = @_;
… …
708 my $tex = $self->{texture} 760 my $tex = $self->{texture}
709 or return; 761 or return;
710 762
711 glEnable GL_TEXTURE_2D; 763 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 765 glColor 1, 1, 1, 1;
714 766
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 768
717 glDisable GL_TEXTURE_2D; 769 glDisable GL_TEXTURE_2D;
718} 770}
… …
721 773
722package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
723 775
724our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
725 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
726sub size_request { 788sub size_request {
727 my ($self) = @_; 789 my ($self) = @_;
728 790
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 792
732 @$self{qw(child_w child_h)} 793 @$self{qw(child_w child_h)}
733} 794}
734 795
735sub size_allocate { 796sub size_allocate {
736 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
737 798
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
802 $self->child->configure (0, 0, $w, $h);
738 $self->update; 803 $self->update;
739} 804}
740 805
741sub set_offset { 806sub set_offset {
742 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
796 861
797 my $slider = new CFClient::UI::Slider 862 my $slider = new CFClient::UI::Slider
798 vertical => 1, 863 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 864 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 865 connect_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 866 $self->{vp}->set_offset (0, $_[1]);
802 }, 867 },
803 ; 868 ;
804 869
805 $self = $class->SUPER::new ( 870 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 871 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 872 slider => $slider,
808 @_, 873 @_,
809 ); 874 );
810 875
811 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
814 879
815 $self 880 $self
881}
882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
896 $self->SUPER::size_allocate ($w, $h);
897
898 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 900}
817 901
818#TODO# update range on size_allocate depending on child 902#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 903# update viewport offset on scroll
820 904
… …
874 my $class = shift; 958 my $class = shift;
875 959
876 # TODO: user_x, user_y, overwrite moveto? 960 # TODO: user_x, user_y, overwrite moveto?
877 961
878 my $self = $class->SUPER::new ( 962 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 963 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 964 border_bg => [1, 1, 1, 1],
881 border => 0.6, 965 border => 0.6,
882 toplevel => 1, 966 is_toplevel => 1,
883 can_events => 1, 967 can_events => 1,
884 @_ 968 @_
885 ); 969 );
886 970
887 $self->{title} &&= new CFClient::UI::Label 971 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 972 align => 0,
… …
1028sub new { 1112sub new {
1029 my $class = shift; 1113 my $class = shift;
1030 1114
1031 $class->SUPER::new ( 1115 $class->SUPER::new (
1032 col_expand => [], 1116 col_expand => [],
1033 @_ 1117 @_,
1034 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1123}
1036 1124
1037sub add { 1125sub add {
1038 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1039 1127
1040 $child->set_parent ($self); 1128 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1042 1130
1043 $child->check_size; 1131 $self->check_size (1);
1044} 1132}
1045 1133
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1135sub clear {
1052 my ($self) = @_; 1136 my ($self) = @_;
1053 1137
1054 my @children = $self->children; 1138 my @children = $self->children;
1055 delete $self->{children}; 1139 delete $self->{children};
… …
1057 for (@children) { 1141 for (@children) {
1058 delete $_->{parent}; 1142 delete $_->{parent};
1059 $_->hide; 1143 $_->hide;
1060 } 1144 }
1061 1145
1146 $self->check_size (1);
1062 $self->update; 1147 $self->update;
1063} 1148}
1064 1149
1065sub get_wh { 1150sub get_wh {
1066 my ($self) = @_; 1151 my ($self) = @_;
… …
1098sub size_allocate { 1183sub size_allocate {
1099 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1100 1185
1101 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1102 1187
1103 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1105 1190
1106 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1297 #bg => none 1382 #bg => none
1298 #active_bg => none 1383 #active_bg => none
1299 #font => default_font 1384 #font => default_font
1300 #text => initial text 1385 #text => initial text
1301 #markup => initial narkup 1386 #markup => initial narkup
1387 #max_w => maximum pixel width
1388 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1389 layout => (new CFClient::Layout),
1303 fontsize => 1, 1390 fontsize => 1,
1304 align => -1, 1391 align => -1,
1305 valign => -1, 1392 valign => -1,
1306 padding => 2, 1393 padding => 2,
… …
1371sub size_request { 1458sub size_request {
1372 my ($self) = @_; 1459 my ($self) = @_;
1373 1460
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1461 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1462 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1466
1378 my ($w, $h) = $self->{layout}->size; 1467 my ($w, $h) = $self->{layout}->size;
1379 1468
1380 if (exists $self->{template}) { 1469 if (exists $self->{template}) {
… …
1416 1505
1417 my $tex = $self->{texture} ||= do { 1506 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1507 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1508 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1509 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1513
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1514 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1515
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1464 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1465 can_hover => 1, 1556 can_hover => 1,
1466 can_focus => 1, 1557 can_focus => 1,
1467 valign => 0, 1558 valign => 0,
1468 can_events => 1, 1559 can_events => 1,
1560 #text => ...
1469 @_ 1561 @_
1470 ) 1562 )
1471} 1563}
1472 1564
1473sub _set_text { 1565sub _set_text {
… …
1483 $self->{text} = $text; 1575 $self->{text} = $text;
1484 1576
1485 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1487 1579
1488 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1489} 1581}
1490 1582
1491sub set_text { 1583sub set_text {
1492 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1493 1585
… …
1505 my ($self) = @_; 1597 my ($self) = @_;
1506 1598
1507 my ($w, $h) = $self->SUPER::size_request; 1599 my ($w, $h) = $self->SUPER::size_request;
1508 1600
1509 ($w + 1, $h) # add 1 for cursor 1601 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1602}
1517 1603
1518sub key_down { 1604sub key_down {
1519 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1520 1606
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1625 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1626 $self->_emit ('escape');
1541 } elsif ($uni) { 1627 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1629 }
1544 1630
1545 $self->_set_text ($text); 1631 $self->_set_text ($text);
… …
1632 if ($sym == 13) { 1718 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1638 $self->update; 1724 $self->update;
1639 1725
1640 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
… …
1690 can_events => 1, 1776 can_events => 1,
1691 @_ 1777 @_
1692 ) 1778 )
1693} 1779}
1694 1780
1781sub activate { }
1782
1695sub button_up { 1783sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1697 1785
1786 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1789}
1703 1790
1704sub _draw { 1791sub _draw {
1705 my ($self) = @_; 1792 my ($self) = @_;
1706 1793
… …
1758 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1759 1846
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1764 } 1851 }
1765} 1852}
1766 1853
1767sub _draw { 1854sub _draw {
1768 my ($self) = @_; 1855 my ($self) = @_;
… …
2043 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2131 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2133 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2134 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2135 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2136 req_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2137 req_h => $::WIDTH / 80,
2051 vertical => 0, 2138 vertical => 0,
2052 can_hover => 1, 2139 can_hover => 1,
2053 inner_pad => .05, 2140 inner_pad => 0.02,
2054 @_ 2141 @_
2055 ); 2142 );
2056 2143
2057 $self->set_value ($self->{range}[0]); 2144 $self->set_value ($self->{range}[0]);
2058 $self->update; 2145 $self->update;
2059 2146
2060 $self 2147 $self
2061} 2148}
2062 2149
2150sub set_range {
2151 my ($self, $range) = @_;
2152
2153 ($range, $self->{range}) = ($self->{range}, $range);
2154
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2157}
2158
2063sub set_value { 2159sub set_value {
2064 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2065 2161
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2162 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2163
2068 $hi = $lo + 1 if $hi <= $lo; 2164 $hi = $lo + 1 if $hi <= $lo;
2069 2165
2166 $page = $hi - $lo if $page > $hi - $lo;
2167
2070 $value = $lo if $value < $lo; 2168 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2169 $value = $hi - $page if $value > $hi - $page;
2072 2170
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2171 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2172 if $unit;
2075 2173
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2175
2080 if ($value != $old_value) { 2176 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2177 $self->_emit (changed => $value);
2082 $self->update; 2178 $self->update;
2083 } 2179 }
2084} 2180}
2085 2181
2086sub size_request { 2182sub size_request {
… …
2094 2190
2095sub button_down { 2191sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
2097 2193
2098 $self->SUPER::button_down ($ev, $x, $y); 2194 $self->SUPER::button_down ($ev, $x, $y);
2195
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197
2099 $self->mouse_motion ($ev, $x, $y); 2198 $self->mouse_motion ($ev, $x, $y);
2100} 2199}
2101 2200
2102sub mouse_motion { 2201sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2204 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2206
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2207 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2208
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2210
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2212 }
2114} 2213}
2115 2214
2116sub update { 2215sub update {
2117 my ($self) = @_; 2216 my ($self) = @_;
2118 2217
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2219 $self->set_value ($self->{range}[0]);
2121 2220
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2221 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100;
2123 2223
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2224 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2225
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2226 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2227 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2228
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2229 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2230 $value = $value * $self->{scale} + $self->{offset};
2130 2231
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2232 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2233 $self->{knob_w} = $knob_w;
2138 }); 2234 });
2139 2235
2140 $self->SUPER::update; 2236 $self->SUPER::update;
2141} 2237}
2142 2238
… …
2148 glScale $self->{w}, $self->{h}; 2244 glScale $self->{w}, $self->{h};
2149 2245
2150 if ($self->{vertical}) { 2246 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2247 # draw a vertical slider like a rotated horizontal slider
2152 2248
2249 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2250 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2251 }
2156 2252
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2253 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2254 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2255
… …
2166 # draw handle 2262 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2263 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2264
2169 glDisable GL_TEXTURE_2D; 2265 glDisable GL_TEXTURE_2D;
2170} 2266}
2267
2268#############################################################################
2269
2270package CFClient::UI::ValSlider;
2271
2272our @ISA = CFClient::UI::HBox::;
2273
2274sub new {
2275 my ($class, %arg) = @_;
2276
2277 my $range = delete $arg{range};
2278
2279 my $self = $class->SUPER::new (
2280 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2281 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2282 to_value => sub { shift },
2283 from_value => sub { shift },
2284 %arg,
2285 );
2286
2287 $self->{slider}->connect (changed => sub {
2288 my ($self, $value) = @_;
2289 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2290 $self->{parent}->emit (changed => $value);
2291 });
2292
2293# $self->{entry}->connect (changed => sub {
2294# my ($self, $value) = @_;
2295# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2296# $self->{parent}->emit (changed => $value);
2297# });
2298
2299 $self->add ($self->{slider}, $self->{entry});
2300
2301 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2302
2303 $self
2304}
2305
2306sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) }
2171 2308
2172############################################################################# 2309#############################################################################
2173 2310
2174package CFClient::UI::TextView; 2311package CFClient::UI::TextView;
2175 2312
… …
2205 2342
2206 $self->{fontsize} = $fontsize; 2343 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2344 $self->reflow;
2208} 2345}
2209 2346
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2347sub size_allocate {
2230 my ($self, $w, $h) = @_; 2348 my ($self, $w, $h) = @_;
2231 2349
2232 $self->SUPER::size_allocate ($w, $h); 2350 $self->SUPER::size_allocate ($w, $h);
2233 2351
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2354 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2355
2238 $self->reflow; 2356 $self->reflow;
2239} 2357}
2240 2358
2359sub text_size {
2360 my ($self, $text, $indent) = @_;
2361
2362 my $layout = $self->{layout};
2363
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $layout->set_width ($self->{children}[0]{w} - $indent);
2366 $layout->set_markup ($text);
2367
2368 $layout->size
2369}
2370
2371sub reflow {
2372 my ($self) = @_;
2373
2374 $self->{need_reflow}++;
2375 $self->update;
2376}
2377
2378sub set_offset {
2379 my ($self, $offset) = @_;
2380
2381 # todo: base offset on lines or so, not on pixels
2382 $self->{children}[1]->set_value ($offset);
2383}
2384
2385sub clear {
2386 my ($self) = @_;
2387
2388 $self->{par} = [];
2389 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391}
2392
2241sub add_paragraph { 2393sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2394 my ($self, $color, $text, $indent) = @_;
2243 2395
2244 #TODO: intelligently "reformat" paragraph 2396 for my $line (split /\n/, $text) {
2245 2397 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2398 $self->{height} += $h;
2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2400 }
2249 2401
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2402 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2403}
2255 2404
2256sub update { 2405sub update {
2257 my ($self) = @_; 2406 my ($self) = @_;
2258 2407
… …
2261 return unless $self->{h} > 0; 2410 return unless $self->{h} > 0;
2262 2411
2263 delete $self->{texture}; 2412 delete $self->{texture};
2264 2413
2265 $ROOT->on_post_alloc ($self, sub { 2414 $ROOT->on_post_alloc ($self, sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416
2266 if (delete $self->{need_reflow}) { 2417 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2418 my $height = 0;
2268 2419
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2270 for @{$self->{par}}; 2424 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]);
2427 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h;
2431 }
2432
2433 $height += $_->[1];
2434 }
2271 2435
2272 $self->{height} = $height; 2436 $self->{height} = $height;
2273 2437
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2439
2276 delete $self->{texture}; 2440 delete $self->{texture};
2277 } 2441 }
2278 2442
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2444 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2445 glClear GL_COLOR_BUFFER_BIT;
2282 2446
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2447 my $top = int $self->{children}[1]{range}[0];
2287 2448
2288 my $y0 = $top; 2449 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2450 my $y1 = $top + $H;
2290 2451
2291 my $y = 0; 2452 my $y = 0;
2292 2453
2293 my $layout = $self->{layout}; 2454 my $layout = $self->{layout};
2294 2455
2295 $layout->set_font ($self->{font}) if $self->{font}; 2456 $layout->set_font ($self->{font}) if $self->{font};
2296 2457
2458 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off
2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2461
2297 for my $par (@{$self->{par}}) { 2462 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2463 my $h = $par->[1];
2299 2464
2300 if ($y0 < $y + $h && $y < $y1) { 2465 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2466 $layout->set_foreground (@{ $par->[2] });
2467 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2468 $layout->set_markup ($par->[4]);
2303 2469
2304 my ($W, $H) = $layout->size; 2470 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2471
2472 glRasterPos $par->[3], $y - $y0;
2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2474 }
2307 2475
2308 $y += $h; 2476 $y += $h;
2309 } 2477 }
2310 2478
2311 glDisable GL_TEXTURE_2D; 2479 glDisable GL_BLEND;
2312 }; 2480 };
2313 }); 2481 });
2314} 2482}
2315 2483
2316sub _draw { 2484sub _draw {
2317 my ($self) = @_; 2485 my ($self) = @_;
2318 2486
2319 glEnable GL_TEXTURE_2D; 2487 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2489 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
2324 2492
2325 $self->{children}[1]->draw; 2493 $self->{children}[1]->draw;
2326 2494
2327} 2495}
… …
2396 2564
2397 # TODO: use animation 2565 # TODO: use animation
2398 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open"); 2569 $self->_emit ("open");
2402 } else { 2570 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close"); 2572 $self->_emit ("close");
2405 } 2573 }
2406 2574
2407 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2408} 2576}
2409 2577
2410############################################################################# 2578#############################################################################
2411 2579
2412package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
… …
2426 2594
2427sub set_tooltip_from { 2595sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2596 my ($self, $widget) = @_;
2429 2597
2430 $self->add (new CFClient::UI::Label 2598 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2599 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2601 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2602 fg => [0, 0, 0, 1],
2603 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2604 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2605 );
2437} 2606}
2438 2607
2439sub size_request { 2608sub size_request {
2440 my ($self) = @_; 2609 my ($self) = @_;
… …
2486use CFClient::OpenGL; 2655use CFClient::OpenGL;
2487 2656
2488sub new { 2657sub new {
2489 my $class = shift; 2658 my $class = shift;
2490 2659
2491 $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2492 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2493 @_, 2663 @_,
2494 ) 2664 );
2665
2666 if ($self->{anim} && $self->{animspeed}) {
2667 Scalar::Util::weaken (my $widget = $self);
2668
2669 $self->{timer} = Event->timer (
2670 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2671 hard => 1,
2672 interval => $self->{animspeed},
2673 cb => sub {
2674 ++$widget->{frame};
2675 $widget->update;
2676 },
2677 );
2678 }
2679
2680 $self
2495} 2681}
2496 2682
2497sub size_request { 2683sub size_request {
2498 (32, 8) 2684 (32, 8)
2499} 2685}
2500 2686
2687sub update {
2688 my ($self) = @_;
2689
2690 return unless $self->{visible};
2691
2692 $self->SUPER::update;
2693}
2694
2501sub _draw { 2695sub _draw {
2502 my ($self) = @_; 2696 my ($self) = @_;
2503 2697
2504 return unless $::CONN;#d# manage and cache textures differently 2698 return unless $::CONN;
2699
2700 my $face;
2701
2702 if ($self->{frame}) {
2703 my $anim = $::CONN->{anim}[$self->{anim}];
2704
2705 $face = $anim->[ $self->{frame} % @$anim ]
2706 if $anim && @$anim;
2707 }
2708
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2710
2507 # TODO animation
2508 if ($tex) { 2711 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2712 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2714 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2716 glDisable GL_TEXTURE_2D;
2514 } 2717 }
2515} 2718}
2516 2719
2720sub DESTROY {
2721 my ($self) = @_;
2722
2723 $self->{timer}->cancel
2724 if $self->{timer};
2725
2726 $self->SUPER::DESTROY;
2727}
2728
2517############################################################################# 2729#############################################################################
2518 2730
2519package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2520 2732
2521our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548 2734
2549sub new { 2735sub new {
2550 my $class = shift; 2736 my $class = shift;
2551 2737
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2559 can_hover => 1, 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_, 2740 @_,
2634 ); 2741 );
2635 2742
2636 $self 2743 $self
2637} 2744}
… …
2647 or ($a->{name} cmp $b->{name}) 2754 or ($a->{name} cmp $b->{name})
2648 } @$items; 2755 } @$items;
2649 2756
2650 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2651 2758
2759 my $row = 0;
2652 for my $item (@items) { 2760 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2761 CFClient::Item::update_widgets $item;
2654 $item->update_item ();
2655 }
2656 2762
2657 $self->{scrolled}->add (@items); 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2658 2766
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2660} 2769}
2661 2770
2662sub size_request { 2771sub size_request {
2663 my ($self) = @_; 2772 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2704 2813
2705# popup given the event (must be a mouse button down event currently) 2814# popup given the event (must be a mouse button down event currently)
2706sub popup { 2815sub popup {
2707 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2708 2817
2709 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2710 2819
2711 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2821 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2714 2823
… …
2729 2838
2730 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2840 undef $GRAB;
2732 $self->hide; 2841 $self->hide;
2733 2842
2734 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2736 } 2845 }
2737} 2846}
2738 2847
2739############################################################################# 2848#############################################################################
… …
2774 # TODO: doesn't handle markup well (read as: at all) 2883 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 2884 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 2885 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 2886 : $item->{text};
2778 2887
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 2888 for ($short) {
2782 s/^\s+//; 2889 s/^\s+//;
2783 s/\s+/ /g; 2890 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 2891 }
2787 2892
2788 new CFClient::UI::Label 2893 new CFClient::UI::Label
2789 markup => $short, 2894 markup => $short,
2790 tooltip => $item->{tooltip}, 2895 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 2896 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 2897 tooltip_width => 0.67,
2793 fontsize => $fontsize, 2898 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 2900 fg => $item->{fg},
2795 can_events => 1, 2901 can_events => 1,
2796 can_hover => 1 2902 can_hover => 1
2797 }; 2903 };
2798 } 2904 }
… …
2804sub add { 2910sub add {
2805 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2806 2912
2807 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2809 2917
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2919
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2921
… …
2835 } 2943 }
2836 2944
2837 $self->reorder; 2945 $self->reorder;
2838} 2946}
2839 2947
2948sub reconfigure {
2949 my ($self) = @_;
2950
2951 delete $_->{label}
2952 for values %{ $self->{item} || {} };
2953
2954 $self->reorder;
2955 $self->SUPER::reconfigure;
2956}
2957
2840############################################################################# 2958#############################################################################
2841 2959
2842package CFClient::UI::Root; 2960package CFClient::UI::Root;
2843 2961
2844our @ISA = CFClient::UI::Container::; 2962our @ISA = CFClient::UI::Container::;
… …
2847 2965
2848sub new { 2966sub new {
2849 my $class = shift; 2967 my $class = shift;
2850 2968
2851 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
2852 @_, 2971 @_,
2853 ) 2972 )
2854} 2973}
2855 2974
2856sub configure { 2975sub configure {
… …
2874} 2993}
2875 2994
2876sub size_allocate { 2995sub size_allocate {
2877 my ($self, $w, $h) = @_; 2996 my ($self, $w, $h) = @_;
2878 2997
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885 for my $child ($self->children) { 2998 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3000
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x}; 3002 if exists $child->{req_x};
… …
2918} 3031}
2919 3032
2920sub add { 3033sub add {
2921 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
2922 3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
2923 for my $child (@children) { 3042 for my $child (@children) {
2924 $child->{toplevel} = 1; 3043 $child->{is_toplevel} = 1;
2925 3044
2926 # integerise window positions 3045 # integerise window positions
2927 $child->{x} = int $child->{x}; 3046 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y}; 3047 $child->{y} = int $child->{y};
2929 } 3048 }
2930 3049
2931 $self->SUPER::add (@children); 3050 $self->SUPER::add (@children);
3051}
3052
3053sub remove {
3054 my ($self, @children) = @_;
3055
3056 $self->SUPER::remove (@children);
3057
3058 while (@children) {
3059 my $w = pop @children;
3060 push @children, $w->children;
3061 $w->set_invisible;
3062 }
2932} 3063}
2933 3064
2934sub on_refresh { 3065sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
2936 3067
… …
2989 $w = 0 if $w < 0; 3120 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3121 $h = 0 if $h < 0;
2991 3122
2992 $widget->{w} = $w; 3123 $widget->{w} = $w;
2993 $widget->{h} = $h; 3124 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h);
2995 $widget->emit (size_allocate => $w, $h); 3125 $widget->emit (size_allocate => $w, $h);
2996 } 3126 }
2997 } 3127 }
2998 3128
2999 while ($self->{post_alloc_hook}) { 3129 while ($self->{post_alloc_hook}) {
… …
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3136 glClear GL_COLOR_BUFFER_BIT;
3007 3137
3008 glMatrixMode GL_PROJECTION; 3138 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3139 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3141 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3142 glLoadIdentity;
3013 3143
3014 $self->_draw; 3144 $self->_draw;
3015} 3145}
… …
3017############################################################################# 3147#############################################################################
3018 3148
3019package CFClient::UI; 3149package CFClient::UI;
3020 3150
3021$ROOT = new CFClient::UI::Root; 3151$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3152$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3153
30241 31541
3025 3155

Diff Legend

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