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.211 by elmex, Wed May 17 10:33:03 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 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
… …
285} 322}
286 323
287sub set_tooltip { 324sub set_tooltip {
288 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
289 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
290 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
291 333
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
315 return if $FOCUS == $self; 357 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
317 359
318 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
319 361
320 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
321 363
322 $focus->update if $focus; 364 $focus->update if $focus;
323 $FOCUS->update; 365 $FOCUS->update;
324} 366}
325 367
… …
328 370
329 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
330 372
331 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
332 374
333 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
334 376
335 $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;
336} 381}
337 382
338sub mouse_motion { } 383sub mouse_motion { }
339sub button_up { } 384sub button_up { }
340sub key_down { } 385sub key_down { }
341sub key_up { } 386sub key_up { }
342 387
343sub button_down { 388sub button_down {
344 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
345 390
346 $self->focus_in; 391 $self->focus_in;
… …
380 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
381 glPushMatrix; 426 glPushMatrix;
382 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 430 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
389 glEnd; 434 glEnd;
390 glPopMatrix; 435 glPopMatrix;
391 #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;
392 } 437 }
393} 438}
… …
413sub set_parent { 458sub set_parent {
414 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
415 460
416 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
417 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
418 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size 467 $self->check_size
420 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
469
470 $self->show;
421} 471}
422 472
423sub check_size { 473sub check_size {
424 my ($self, $forced) = @_; 474 my ($self, $forced) = @_;
425 475
… …
438 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
439 489
440 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
441} 491}
442 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
443sub emit { 499sub emit {
444 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
445 501
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
447} 504}
448 505
449sub DESTROY { 506sub DESTROY {
450 my ($self) = @_; 507 my ($self) = @_;
451 508
… …
564 delete $child->{parent}; 621 delete $child->{parent};
565 $child->hide; 622 $child->hide;
566 623
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 625
569 $self->check_size; 626 $self->check_size (1);
570 $self->update; 627 $self->update;
571} 628}
572 629
573sub clear { 630sub clear {
574 my ($self) = @_; 631 my ($self) = @_;
… …
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 746 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 747 glClear GL_COLOR_BUFFER_BIT;
691 748
692 $self->_render; 749 $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 }; 750 };
701} 751}
702 752
703sub _draw { 753sub _draw {
704 my ($self) = @_; 754 my ($self) = @_;
… …
708 my $tex = $self->{texture} 758 my $tex = $self->{texture}
709 or return; 759 or return;
710 760
711 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 763 glColor 1, 1, 1, 1;
714 764
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 766
717 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
718} 768}
… …
721 771
722package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
723 773
724our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
725 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
726sub size_request { 786sub size_request {
727 my ($self) = @_; 787 my ($self) = @_;
728 788
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$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 790
732 @$self{qw(child_w child_h)} 791 @$self{qw(child_w child_h)}
733} 792}
734 793
735sub size_allocate { 794sub size_allocate {
736 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
737 796
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
800 $self->child->configure (0, 0, $w, $h);
738 $self->update; 801 $self->update;
739} 802}
740 803
741sub set_offset { 804sub set_offset {
742 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
796 859
797 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
798 vertical => 1, 861 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 863 connect_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
802 }, 865 },
803 ; 866 ;
804 867
805 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 869 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 870 slider => $slider,
808 @_, 871 @_,
809 ); 872 );
810 873
811 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 875 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
814 877
815 $self 878 $self
879}
880
881sub update {
882 my ($self) = @_;
883
884 $self->SUPER::update;
885
886 # todo: overwrite size_allocate of child
887 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
889}
890
891sub size_allocate {
892 my ($self, $w, $h) = @_;
893
894 $self->SUPER::size_allocate ($w, $h);
895
896 my $child = $self->{vp}->child;
897 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 898}
817 899
818#TODO# update range on size_allocate depending on child 900#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 901# update viewport offset on scroll
820 902
… …
874 my $class = shift; 956 my $class = shift;
875 957
876 # TODO: user_x, user_y, overwrite moveto? 958 # TODO: user_x, user_y, overwrite moveto?
877 959
878 my $self = $class->SUPER::new ( 960 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 961 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 962 border_bg => [1, 1, 1, 1],
881 border => 0.6, 963 border => 0.6,
882 toplevel => 1, 964 is_toplevel => 1,
883 can_events => 1, 965 can_events => 1,
884 @_ 966 @_
885 ); 967 );
886 968
887 $self->{title} &&= new CFClient::UI::Label 969 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 970 align => 0,
… …
1028sub new { 1110sub new {
1029 my $class = shift; 1111 my $class = shift;
1030 1112
1031 $class->SUPER::new ( 1113 $class->SUPER::new (
1032 col_expand => [], 1114 col_expand => [],
1033 @_ 1115 @_,
1034 ) 1116 )
1117}
1118
1119sub children {
1120 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1121}
1036 1122
1037sub add { 1123sub add {
1038 my ($self, $x, $y, $child) = @_; 1124 my ($self, $x, $y, $child) = @_;
1039 1125
1040 $child->set_parent ($self); 1126 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1127 $self->{children}[$y][$x] = $child;
1042 1128
1043 $child->check_size; 1129 $self->check_size (1);
1044} 1130}
1045 1131
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1132# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1133sub clear {
1052 my ($self) = @_; 1134 my ($self) = @_;
1053 1135
1054 my @children = $self->children; 1136 my @children = $self->children;
1055 delete $self->{children}; 1137 delete $self->{children};
… …
1057 for (@children) { 1139 for (@children) {
1058 delete $_->{parent}; 1140 delete $_->{parent};
1059 $_->hide; 1141 $_->hide;
1060 } 1142 }
1061 1143
1144 $self->check_size (1);
1062 $self->update; 1145 $self->update;
1063} 1146}
1064 1147
1065sub get_wh { 1148sub get_wh {
1066 my ($self) = @_; 1149 my ($self) = @_;
… …
1098sub size_allocate { 1181sub size_allocate {
1099 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1100 1183
1101 my ($ws, $hs) = $self->get_wh; 1184 my ($ws, $hs) = $self->get_wh;
1102 1185
1103 my $req_w = sum @$ws; 1186 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1187 my $req_h = (sum @$hs) || 1;
1105 1188
1106 # TODO: nicer code && do row_expand 1189 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1190 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1191 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1192 my $col_expand = (sum @col_expand) || 1;
… …
1297 #bg => none 1380 #bg => none
1298 #active_bg => none 1381 #active_bg => none
1299 #font => default_font 1382 #font => default_font
1300 #text => initial text 1383 #text => initial text
1301 #markup => initial narkup 1384 #markup => initial narkup
1385 #max_w => maximum pixel width
1386 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1387 layout => (new CFClient::Layout),
1303 fontsize => 1, 1388 fontsize => 1,
1304 align => -1, 1389 align => -1,
1305 valign => -1, 1390 valign => -1,
1306 padding => 2, 1391 padding => 2,
… …
1371sub size_request { 1456sub size_request {
1372 my ($self) = @_; 1457 my ($self) = @_;
1373 1458
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1459 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1460 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1464
1378 my ($w, $h) = $self->{layout}->size; 1465 my ($w, $h) = $self->{layout}->size;
1379 1466
1380 if (exists $self->{template}) { 1467 if (exists $self->{template}) {
… …
1416 1503
1417 my $tex = $self->{texture} ||= do { 1504 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1505 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1506 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1507 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1511
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1512 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1513
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1464 active_fg => [0, 0, 0], 1553 active_fg => [0, 0, 0],
1465 can_hover => 1, 1554 can_hover => 1,
1466 can_focus => 1, 1555 can_focus => 1,
1467 valign => 0, 1556 valign => 0,
1468 can_events => 1, 1557 can_events => 1,
1558 #text => ...
1469 @_ 1559 @_
1470 ) 1560 )
1471} 1561}
1472 1562
1473sub _set_text { 1563sub _set_text {
… …
1483 $self->{text} = $text; 1573 $self->{text} = $text;
1484 1574
1485 $text =~ s/./*/g if $self->{hidden}; 1575 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1576 $self->{layout}->set_text ("$text ");
1487 1577
1488 $self->emit (changed => $self->{text}); 1578 $self->_emit (changed => $self->{text});
1489} 1579}
1490 1580
1491sub set_text { 1581sub set_text {
1492 my ($self, $text) = @_; 1582 my ($self, $text) = @_;
1493 1583
… …
1505 my ($self) = @_; 1595 my ($self) = @_;
1506 1596
1507 my ($w, $h) = $self->SUPER::size_request; 1597 my ($w, $h) = $self->SUPER::size_request;
1508 1598
1509 ($w + 1, $h) # add 1 for cursor 1599 ($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} 1600}
1517 1601
1518sub key_down { 1602sub key_down {
1519 my ($self, $ev) = @_; 1603 my ($self, $ev) = @_;
1520 1604
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1619 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1620 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1621 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1623 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1624 $self->_emit ('escape');
1541 } elsif ($uni) { 1625 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1626 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1627 }
1544 1628
1545 $self->_set_text ($text); 1629 $self->_set_text ($text);
… …
1632 if ($sym == 13) { 1716 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1717 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1718 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1719 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1720 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1721 $self->_emit (activate => $txt);
1638 $self->update; 1722 $self->update;
1639 1723
1640 } elsif ($sym == CFClient::SDLK_UP) { 1724 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1725 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1726 $self->{history_saveback} = $self->get_text;
… …
1690 can_events => 1, 1774 can_events => 1,
1691 @_ 1775 @_
1692 ) 1776 )
1693} 1777}
1694 1778
1779sub activate { }
1780
1695sub button_up { 1781sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1782 my ($self, $ev, $x, $y) = @_;
1697 1783
1784 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1785 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1786 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1787}
1703 1788
1704sub _draw { 1789sub _draw {
1705 my ($self) = @_; 1790 my ($self) = @_;
1706 1791
… …
1758 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1759 1844
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762 $self->{state} = !$self->{state}; 1847 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1848 $self->_emit (changed => $self->{state});
1764 } 1849 }
1765} 1850}
1766 1851
1767sub _draw { 1852sub _draw {
1768 my ($self) = @_; 1853 my ($self) = @_;
… …
2043 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2129 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2130 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2131 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2132 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2133 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2134 req_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2135 req_h => $::WIDTH / 80,
2051 vertical => 0, 2136 vertical => 0,
2052 can_hover => 1, 2137 can_hover => 1,
2053 inner_pad => .05, 2138 inner_pad => 0.02,
2054 @_ 2139 @_
2055 ); 2140 );
2056 2141
2057 $self->set_value ($self->{range}[0]); 2142 $self->set_value ($self->{range}[0]);
2058 $self->update; 2143 $self->update;
2059 2144
2060 $self 2145 $self
2061} 2146}
2062 2147
2148sub set_range {
2149 my ($self, $range) = @_;
2150
2151 ($range, $self->{range}) = ($self->{range}, $range);
2152
2153 $self->update
2154 if "@$range" ne "@{$self->{range}}";
2155}
2156
2063sub set_value { 2157sub set_value {
2064 my ($self, $value) = @_; 2158 my ($self, $value) = @_;
2065 2159
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2160 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2161
2068 $hi = $lo + 1 if $hi <= $lo; 2162 $hi = $lo + 1 if $hi <= $lo;
2069 2163
2164 $page = $hi - $lo if $page > $hi - $lo;
2165
2070 $value = $lo if $value < $lo; 2166 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2167 $value = $hi - $page if $value > $hi - $page;
2072 2168
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2169 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2170 if $unit;
2075 2171
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2172 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2173
2080 if ($value != $old_value) { 2174 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2175 $self->_emit (changed => $value);
2082 $self->update; 2176 $self->update;
2083 } 2177 }
2084} 2178}
2085 2179
2086sub size_request { 2180sub size_request {
… …
2094 2188
2095sub button_down { 2189sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2190 my ($self, $ev, $x, $y) = @_;
2097 2191
2098 $self->SUPER::button_down ($ev, $x, $y); 2192 $self->SUPER::button_down ($ev, $x, $y);
2193
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195
2099 $self->mouse_motion ($ev, $x, $y); 2196 $self->mouse_motion ($ev, $x, $y);
2100} 2197}
2101 2198
2102sub mouse_motion { 2199sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2200 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2202 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2203 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2204
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2205 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2206
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2208
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2210 }
2114} 2211}
2115 2212
2116sub update { 2213sub update {
2117 my ($self) = @_; 2214 my ($self) = @_;
2118 2215
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2217 $self->set_value ($self->{range}[0]);
2121 2218
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2219 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100;
2123 2221
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2222 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2223
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2224 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2225 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2226
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2227 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2228 $value = $value * $self->{scale} + $self->{offset};
2130 2229
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; 2230 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2231 $self->{knob_w} = $knob_w;
2138 }); 2232 });
2139 2233
2140 $self->SUPER::update; 2234 $self->SUPER::update;
2141} 2235}
2142 2236
… …
2148 glScale $self->{w}, $self->{h}; 2242 glScale $self->{w}, $self->{h};
2149 2243
2150 if ($self->{vertical}) { 2244 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2245 # draw a vertical slider like a rotated horizontal slider
2152 2246
2247 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2248 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2249 }
2156 2250
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2251 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2252 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2253
… …
2166 # draw handle 2260 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2261 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2262
2169 glDisable GL_TEXTURE_2D; 2263 glDisable GL_TEXTURE_2D;
2170} 2264}
2265
2266#############################################################################
2267
2268package CFClient::UI::ValSlider;
2269
2270our @ISA = CFClient::UI::HBox::;
2271
2272sub new {
2273 my ($class, %arg) = @_;
2274
2275 my $range = delete $arg{range};
2276
2277 my $self = $class->SUPER::new (
2278 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2279 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2280 to_value => sub { shift },
2281 from_value => sub { shift },
2282 %arg,
2283 );
2284
2285 $self->{slider}->connect (changed => sub {
2286 my ($self, $value) = @_;
2287 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2288 $self->{parent}->emit (changed => $value);
2289 });
2290
2291# $self->{entry}->connect (changed => sub {
2292# my ($self, $value) = @_;
2293# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2294# $self->{parent}->emit (changed => $value);
2295# });
2296
2297 $self->add ($self->{slider}, $self->{entry});
2298
2299 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2300
2301 $self
2302}
2303
2304sub set_range { shift->{slider}->set_range (@_) }
2305sub set_value { shift->{slider}->set_value (@_) }
2171 2306
2172############################################################################# 2307#############################################################################
2173 2308
2174package CFClient::UI::TextView; 2309package CFClient::UI::TextView;
2175 2310
… …
2205 2340
2206 $self->{fontsize} = $fontsize; 2341 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2342 $self->reflow;
2208} 2343}
2209 2344
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 { 2345sub size_allocate {
2230 my ($self, $w, $h) = @_; 2346 my ($self, $w, $h) = @_;
2231 2347
2232 $self->SUPER::size_allocate ($w, $h); 2348 $self->SUPER::size_allocate ($w, $h);
2233 2349
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2352 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2353
2238 $self->reflow; 2354 $self->reflow;
2239} 2355}
2240 2356
2357sub text_size {
2358 my ($self, $text, $indent) = @_;
2359
2360 my $layout = $self->{layout};
2361
2362 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2363 $layout->set_width ($self->{children}[0]{w} - $indent);
2364 $layout->set_markup ($text);
2365
2366 $layout->size
2367}
2368
2369sub reflow {
2370 my ($self) = @_;
2371
2372 $self->{need_reflow}++;
2373 $self->update;
2374}
2375
2376sub set_offset {
2377 my ($self, $offset) = @_;
2378
2379 # todo: base offset on lines or so, not on pixels
2380 $self->{children}[1]->set_value ($offset);
2381}
2382
2383sub clear {
2384 my ($self) = @_;
2385
2386 $self->{par} = [];
2387 $self->{height} = 0;
2388 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2389}
2390
2241sub add_paragraph { 2391sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2392 my ($self, $color, $text, $indent) = @_;
2243 2393
2244 #TODO: intelligently "reformat" paragraph 2394 for my $line (split /\n/, $text) {
2245 2395 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2396 $self->{height} += $h;
2397 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2398 }
2249 2399
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2400 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2401}
2255 2402
2256sub update { 2403sub update {
2257 my ($self) = @_; 2404 my ($self) = @_;
2258 2405
… …
2261 return unless $self->{h} > 0; 2408 return unless $self->{h} > 0;
2262 2409
2263 delete $self->{texture}; 2410 delete $self->{texture};
2264 2411
2265 $ROOT->on_post_alloc ($self, sub { 2412 $ROOT->on_post_alloc ($self, sub {
2413 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2414
2266 if (delete $self->{need_reflow}) { 2415 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2416 my $height = 0;
2268 2417
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2418 my $layout = $self->{layout};
2419
2420 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2421
2270 for @{$self->{par}}; 2422 for (@{$self->{par}}) {
2423 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2424 $layout->set_width ($W - $_->[3]);
2425 $layout->set_markup ($_->[4]);
2426 my ($w, $h) = $layout->size;
2427 $_->[0] = $w + $_->[3];
2428 $_->[1] = $h;
2429 }
2430
2431 $height += $_->[1];
2432 }
2271 2433
2272 $self->{height} = $height; 2434 $self->{height} = $height;
2273 2435
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2436 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2437
2276 delete $self->{texture}; 2438 delete $self->{texture};
2277 } 2439 }
2278 2440
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2442 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2443 glClear GL_COLOR_BUFFER_BIT;
2282 2444
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]; 2445 my $top = int $self->{children}[1]{range}[0];
2287 2446
2288 my $y0 = $top; 2447 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2448 my $y1 = $top + $H;
2290 2449
2291 my $y = 0; 2450 my $y = 0;
2292 2451
2293 my $layout = $self->{layout}; 2452 my $layout = $self->{layout};
2294 2453
2295 $layout->set_font ($self->{font}) if $self->{font}; 2454 $layout->set_font ($self->{font}) if $self->{font};
2296 2455
2456 glEnable GL_BLEND;
2457 #TODO# not correct in windows where rgba is forced off
2458 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2459
2297 for my $par (@{$self->{par}}) { 2460 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2461 my $h = $par->[1];
2299 2462
2300 if ($y0 < $y + $h && $y < $y1) { 2463 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2464 $layout->set_foreground (@{ $par->[2] });
2465 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2466 $layout->set_markup ($par->[4]);
2303 2467
2304 my ($W, $H) = $layout->size; 2468 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2469
2470 glRasterPos $par->[3], $y - $y0;
2471 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2472 }
2307 2473
2308 $y += $h; 2474 $y += $h;
2309 } 2475 }
2310 2476
2311 glDisable GL_TEXTURE_2D; 2477 glDisable GL_BLEND;
2312 }; 2478 };
2313 }); 2479 });
2314} 2480}
2315 2481
2316sub _draw { 2482sub _draw {
2317 my ($self) = @_; 2483 my ($self) = @_;
2318 2484
2319 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2324 2490
2325 $self->{children}[1]->draw; 2491 $self->{children}[1]->draw;
2326 2492
2327} 2493}
… …
2396 2562
2397 # TODO: use animation 2563 # TODO: use animation
2398 if ($self->{state} = !$self->{state}) { 2564 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other}); 2565 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h})); 2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open"); 2567 $self->_emit ("open");
2402 } else { 2568 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other}); 2569 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close"); 2570 $self->_emit ("close");
2405 } 2571 }
2406 2572
2407 $self->emit (changed => $self->{state}); 2573 $self->_emit (changed => $self->{state});
2408} 2574}
2409 2575
2410############################################################################# 2576#############################################################################
2411 2577
2412package CFClient::UI::Tooltip; 2578package CFClient::UI::Tooltip;
… …
2426 2592
2427sub set_tooltip_from { 2593sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2594 my ($self, $widget) = @_;
2429 2595
2430 $self->add (new CFClient::UI::Label 2596 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2597 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2599 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2600 fg => [0, 0, 0, 1],
2601 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2602 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2603 );
2437} 2604}
2438 2605
2439sub size_request { 2606sub size_request {
2440 my ($self) = @_; 2607 my ($self) = @_;
… …
2486use CFClient::OpenGL; 2653use CFClient::OpenGL;
2487 2654
2488sub new { 2655sub new {
2489 my $class = shift; 2656 my $class = shift;
2490 2657
2491 $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2492 aspect => 1, 2659 aspect => 1,
2660 can_events => 0,
2493 @_, 2661 @_,
2494 ) 2662 );
2663
2664 if ($self->{anim} && $self->{animspeed}) {
2665 Scalar::Util::weaken (my $widget = $self);
2666
2667 $self->{timer} = Event->timer (
2668 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2669 hard => 1,
2670 interval => $self->{animspeed},
2671 cb => sub {
2672 ++$widget->{frame};
2673 $widget->update;
2674 },
2675 );
2676 }
2677
2678 $self
2495} 2679}
2496 2680
2497sub size_request { 2681sub size_request {
2498 (32, 8) 2682 (32, 8)
2499} 2683}
2500 2684
2685sub update {
2686 my ($self) = @_;
2687
2688 return unless $self->{visible};
2689
2690 $self->SUPER::update;
2691}
2692
2501sub _draw { 2693sub _draw {
2502 my ($self) = @_; 2694 my ($self) = @_;
2503 2695
2504 return unless $::CONN;#d# manage and cache textures differently 2696 return unless $::CONN;
2697
2698 my $face;
2699
2700 if ($self->{frame}) {
2701 my $anim = $::CONN->{anim}[$self->{anim}];
2702
2703 $face = $anim->[ $self->{frame} % @$anim ]
2704 if $anim && @$anim;
2705 }
2706
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2708
2507 # TODO animation
2508 if ($tex) { 2709 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2712 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2714 glDisable GL_TEXTURE_2D;
2514 } 2715 }
2515} 2716}
2516 2717
2718sub DESTROY {
2719 my ($self) = @_;
2720
2721 $self->{timer}->cancel
2722 if $self->{timer};
2723
2724 $self->SUPER::DESTROY;
2725}
2726
2517############################################################################# 2727#############################################################################
2518 2728
2519package CFClient::UI::InventoryItem; 2729package CFClient::UI::Inventory;
2520 2730
2521our @ISA = CFClient::UI::HBox::; 2731our @ISA = CFClient::UI::ScrolledWindow::;
2522 2732
2523sub new { 2733sub new {
2524 my $class = shift; 2734 my $class = shift;
2525 2735
2526 my %args = @_;
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2550 can_hover => 1, 2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2551 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_;
2556
2557 # todo: maybe put examine on 1? but should just be a tooltip :(
2558 if ($ev->{button} == 1) {
2559 my $targ = $::CONN->{player}{tag};
2560
2561 if ($item->{container} == $::CONN->{player}{tag}) {
2562 $targ = $main::OPENCONT;
2563 }
2564
2565 $::CONN->send ("move $targ $item->{tag} 0");
2566 } elsif ($ev->{button} == 2) {
2567 $::CONN->send ("apply $item->{tag}");
2568 } elsif ($ev->{button} == 3) {
2569 my @menu_items = (
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2572 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2573 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2574 [
2575 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2576 sub { $::CONN->send ("lock $item->{tag}") },
2577 ],
2578 );
2579
2580 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2581 }
2582
2583 1
2584 },
2585 %args
2586 );
2587
2588 $self->add (new CFClient::UI::Face
2589 can_events => 0,
2590 face => $item->{face},
2591 anim => $item->{anim},
2592 animspeed => $item->{animspeed},
2593 );
2594
2595 $self->add (new CFClient::UI::Label
2596 can_events => 0,
2597 text => $desc,
2598 );
2599
2600 $self
2601}
2602
2603#############################################################################
2604
2605package CFClient::UI::Inventory;
2606
2607our @ISA = CFClient::UI::ScrolledWindow::;
2608
2609sub new {
2610 my $class = shift;
2611
2612 my $self = $class->SUPER::new (
2613 scrolled => (new CFClient::UI::VBox),
2614 @_, 2738 @_,
2615 ); 2739 );
2616 2740
2617 $self 2741 $self
2618} 2742}
… …
2628 or ($a->{name} cmp $b->{name}) 2752 or ($a->{name} cmp $b->{name})
2629 } @$items; 2753 } @$items;
2630 2754
2631 $self->{real_items} = \@items; 2755 $self->{real_items} = \@items;
2632 2756
2757 my $row = 0;
2633 for my $item (@items) { 2758 for my $item (@items) {
2634 my $desc = $item->{nrof} < 2 2759 CFClient::Item::update_widgets $item;
2635 ? $item->{name}
2636 : "$item->{nrof} $item->{name_pl}";
2637 2760
2638 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2639 } 2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2640 2764
2641 $self->{scrolled}->add (@items); 2765 $row++;
2642 2766 }
2643# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2644} 2767}
2645 2768
2646sub size_request { 2769sub size_request {
2647 my ($self) = @_; 2770 my ($self) = @_;
2648 ($self->{req_w}, $self->{req_h}); 2771 ($self->{req_w}, $self->{req_h});
… …
2688 2811
2689# popup given the event (must be a mouse button down event currently) 2812# popup given the event (must be a mouse button down event currently)
2690sub popup { 2813sub popup {
2691 my ($self, $ev) = @_; 2814 my ($self, $ev) = @_;
2692 2815
2693 $self->emit ("popdown"); 2816 $self->_emit ("popdown");
2694 2817
2695 # maybe save $GRAB? must be careful about events... 2818 # maybe save $GRAB? must be careful about events...
2696 $GRAB = $self; 2819 $GRAB = $self;
2697 $self->{button} = $ev->{button}; 2820 $self->{button} = $ev->{button};
2698 2821
… …
2713 2836
2714 if ($ev->{button} == $self->{button}) { 2837 if ($ev->{button} == $self->{button}) {
2715 undef $GRAB; 2838 undef $GRAB;
2716 $self->hide; 2839 $self->hide;
2717 2840
2718 $self->emit ("popdown"); 2841 $self->_emit ("popdown");
2719 $self->{hover}[1]->() if $self->{hover}; 2842 $self->{hover}[1]->() if $self->{hover};
2720 } 2843 }
2721} 2844}
2722 2845
2723############################################################################# 2846#############################################################################
… …
2758 # TODO: doesn't handle markup well (read as: at all) 2881 # TODO: doesn't handle markup well (read as: at all)
2759 my $short = $item->{count} > 1 2882 my $short = $item->{count} > 1
2760 ? "<b>$item->{count} ×</b> $item->{text}" 2883 ? "<b>$item->{count} ×</b> $item->{text}"
2761 : $item->{text}; 2884 : $item->{text};
2762 2885
2763 my $fontsize = $item->{fontsize} || $self->{fontsize};
2764
2765 for ($short) { 2886 for ($short) {
2766 s/^\s+//; 2887 s/^\s+//;
2767 s/\s+/ /g; 2888 s/\s+/ /g;
2768 my $len = int 40 / $fontsize;
2769 substr $_, $len, length, "…" if $len < length;
2770 } 2889 }
2771 2890
2772 new CFClient::UI::Label 2891 new CFClient::UI::Label
2773 markup => $short, 2892 markup => $short,
2774 tooltip => $item->{tooltip}, 2893 tooltip => $item->{tooltip},
2775 tooltip_font => $::FONT_PROP, 2894 tooltip_font => $::FONT_PROP,
2776 tooltip_width => 0.67, 2895 tooltip_width => 0.67,
2777 fontsize => $fontsize, 2896 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44,
2778 fg => $item->{fg}, 2898 fg => $item->{fg},
2779 can_events => 1, 2899 can_events => 1,
2780 can_hover => 1 2900 can_hover => 1
2781 }; 2901 };
2782 } 2902 }
… …
2788sub add { 2908sub add {
2789 my ($self, $text, %arg) = @_; 2909 my ($self, $text, %arg) = @_;
2790 2910
2791 $text =~ s/^\s+//; 2911 $text =~ s/^\s+//;
2792 $text =~ s/\s+$//; 2912 $text =~ s/\s+$//;
2913
2914 return unless $text;
2793 2915
2794 my $timeout = time + ((delete $arg{timeout}) || 60); 2916 my $timeout = time + ((delete $arg{timeout}) || 60);
2795 2917
2796 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2797 2919
… …
2819 } 2941 }
2820 2942
2821 $self->reorder; 2943 $self->reorder;
2822} 2944}
2823 2945
2946sub reconfigure {
2947 my ($self) = @_;
2948
2949 delete $_->{label}
2950 for values %{ $self->{item} || {} };
2951
2952 $self->reorder;
2953 $self->SUPER::reconfigure;
2954}
2955
2824############################################################################# 2956#############################################################################
2825 2957
2826package CFClient::UI::Root; 2958package CFClient::UI::Root;
2827 2959
2828our @ISA = CFClient::UI::Container::; 2960our @ISA = CFClient::UI::Container::;
… …
2858} 2990}
2859 2991
2860sub size_allocate { 2992sub size_allocate {
2861 my ($self, $w, $h) = @_; 2993 my ($self, $w, $h) = @_;
2862 2994
2863 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2864 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2865
2866 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2867 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2868
2869 for my $child ($self->children) { 2995 for my $child ($self->children) {
2870 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2871 2997
2872 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2873 if exists $child->{req_x}; 2999 if exists $child->{req_x};
… …
2902} 3028}
2903 3029
2904sub add { 3030sub add {
2905 my ($self, @children) = @_; 3031 my ($self, @children) = @_;
2906 3032
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
2907 for my $child (@children) { 3039 for my $child (@children) {
2908 $child->{toplevel} = 1; 3040 $child->{is_toplevel} = 1;
2909 3041
2910 # integerise window positions 3042 # integerise window positions
2911 $child->{x} = int $child->{x}; 3043 $child->{x} = int $child->{x};
2912 $child->{y} = int $child->{y}; 3044 $child->{y} = int $child->{y};
2913 } 3045 }
2914 3046
2915 $self->SUPER::add (@children); 3047 $self->SUPER::add (@children);
3048}
3049
3050sub remove {
3051 my ($self, @children) = @_;
3052
3053 $self->SUPER::remove (@children);
3054
3055 while (@children) {
3056 my $w = pop @children;
3057 push @children, $w->children;
3058 $w->set_invisible;
3059 }
2916} 3060}
2917 3061
2918sub on_refresh { 3062sub on_refresh {
2919 my ($self, $id, $cb) = @_; 3063 my ($self, $id, $cb) = @_;
2920 3064
… …
2973 $w = 0 if $w < 0; 3117 $w = 0 if $w < 0;
2974 $h = 0 if $h < 0; 3118 $h = 0 if $h < 0;
2975 3119
2976 $widget->{w} = $w; 3120 $widget->{w} = $w;
2977 $widget->{h} = $h; 3121 $widget->{h} = $h;
2978 $widget->size_allocate ($w, $h);
2979 $widget->emit (size_allocate => $w, $h); 3122 $widget->emit (size_allocate => $w, $h);
2980 } 3123 }
2981 } 3124 }
2982 3125
2983 while ($self->{post_alloc_hook}) { 3126 while ($self->{post_alloc_hook}) {
… …
2989 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2990 glClear GL_COLOR_BUFFER_BIT; 3133 glClear GL_COLOR_BUFFER_BIT;
2991 3134
2992 glMatrixMode GL_PROJECTION; 3135 glMatrixMode GL_PROJECTION;
2993 glLoadIdentity; 3136 glLoadIdentity;
2994 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2995 glMatrixMode GL_MODELVIEW; 3138 glMatrixMode GL_MODELVIEW;
2996 glLoadIdentity; 3139 glLoadIdentity;
2997 3140
2998 $self->_draw; 3141 $self->_draw;
2999} 3142}
… …
3001############################################################################# 3144#############################################################################
3002 3145
3003package CFClient::UI; 3146package CFClient::UI;
3004 3147
3005$ROOT = new CFClient::UI::Root; 3148$ROOT = new CFClient::UI::Root;
3006$TOOLTIP = new CFClient::UI::Tooltip; 3149$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3007 3150
30081 31511
3009 3152

Diff Legend

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