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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

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

Diff Legend

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