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

Diff Legend

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