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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.242 by elmex, Sat May 27 20:00:40 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
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $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}; 178 $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}; 179 $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}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 } 185 }
159
160 $widget->reconfigure;
161 } 186 }
187
188 reconfigure_widgets;
162} 189}
163 190
164############################################################################# 191#############################################################################
165 192
166package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
186 } 213 }
187 } 214 }
188 215
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190 217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
191 $self 225 $self
192} 226}
193 227
194sub destroy { 228sub destroy {
195 my ($self) = @_; 229 my ($self) = @_;
… …
198 %$self = (); 232 %$self = ();
199} 233}
200 234
201sub show { 235sub show {
202 my ($self) = @_; 236 my ($self) = @_;
203
204 return if $self->{parent}; 237 return if $self->{parent};
205 238
206 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
207} 240}
208 241
209sub hide { 242sub show_centered {
210 my ($self) = @_; 243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
211 262
212 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 264 undef $HOVER if $HOVER == $self;
265
266 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self;
268
269 $self->focus_out;
270}
271
272sub hide {
273 my ($self) = @_;
274
275 $self->set_invisible;
214 276
215 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
216 if $self->{parent}; 278 if $self->{parent};
217} 279}
218 280
… …
288} 350}
289 351
290sub set_tooltip { 352sub set_tooltip {
291 my ($self, $tooltip) = @_; 353 my ($self, $tooltip) = @_;
292 354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
293 $self->{tooltip} = $tooltip; 360 $self->{tooltip} = $tooltip;
294 361
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 363 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 364 CFClient::UI::check_tooltip;
… …
318 return if $FOCUS == $self; 385 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
320 387
321 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
322 389
323 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
324 391
325 $focus->update if $focus; 392 $focus->update if $focus;
326 $FOCUS->update; 393 $FOCUS->update;
327} 394}
328 395
… …
331 398
332 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
333 400
334 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
335 402
336 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
337 404
338 $focus->update if $focus; #? 405 $focus->update if $focus; #?
406
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS;
339} 409}
340 410
341sub mouse_motion { } 411sub mouse_motion { }
342sub button_up { } 412sub button_up { }
343sub key_down { } 413sub key_down { }
344sub key_up { } 414sub key_up { }
345 415
346sub button_down { 416sub button_down {
347 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
348 418
349 $self->focus_in; 419 $self->focus_in;
… …
383 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix; 454 glPushMatrix;
385 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 458 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
392 glEnd; 462 glEnd;
393 glPopMatrix; 463 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 465 }
396} 466}
… …
416sub set_parent { 486sub set_parent {
417 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
418 488
419 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
420 490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
421 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 495 $self->check_size
423 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
497
498 $self->show;
424} 499}
425 500
426sub check_size { 501sub check_size {
427 my ($self, $forced) = @_; 502 my ($self, $forced) = @_;
428 503
… …
441 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
442 517
443 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 519}
445 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
446sub emit { 527sub emit {
447 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
448 529
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
450} 532}
451 533
452sub DESTROY { 534sub DESTROY {
453 my ($self) = @_; 535 my ($self) = @_;
454 536
… …
567 delete $child->{parent}; 649 delete $child->{parent};
568 $child->hide; 650 $child->hide;
569 651
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 653
572 $self->check_size; 654 $self->check_size (1);
573 $self->update; 655 $self->update;
574} 656}
575 657
576sub clear { 658sub clear {
577 my ($self) = @_; 659 my ($self) = @_;
… …
717 799
718package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
719 801
720our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
721 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
722sub size_request { 814sub size_request {
723 my ($self) = @_; 815 my ($self) = @_;
724 816
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 818
728 @$self{qw(child_w child_h)} 819 @$self{qw(child_w child_h)}
729} 820}
730 821
731sub size_allocate { 822sub size_allocate {
732 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
733 824
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
828 $self->child->configure (0, 0, $w, $h);
734 $self->update; 829 $self->update;
735} 830}
736 831
737sub set_offset { 832sub set_offset {
738 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
792 887
793 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
794 vertical => 1, 889 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 891 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 892 $self->{vp}->set_offset (0, $_[1]);
798 }, 893 },
799 ; 894 ;
800 895
801 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 897 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 898 slider => $slider,
804 @_, 899 @_,
805 ); 900 );
806 901
807 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
810 905
811 $self 906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917}
918
919sub size_allocate {
920 my ($self, $w, $h) = @_;
921
922 $self->SUPER::size_allocate ($w, $h);
923
924 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 926}
813 927
814#TODO# update range on size_allocate depending on child 928#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 929# update viewport offset on scroll
816 930
… …
870 my $class = shift; 984 my $class = shift;
871 985
872 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
873 987
874 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
877 border => 0.6, 991 border => 0.6,
878 toplevel => 1, 992 is_toplevel => 1,
879 can_events => 1, 993 can_events => 1,
880 @_ 994 @_
881 ); 995 );
882 996
883 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 998 align => 0,
… …
1024sub new { 1138sub new {
1025 my $class = shift; 1139 my $class = shift;
1026 1140
1027 $class->SUPER::new ( 1141 $class->SUPER::new (
1028 col_expand => [], 1142 col_expand => [],
1029 @_ 1143 @_,
1030 ) 1144 )
1145}
1146
1147sub children {
1148 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1149}
1032 1150
1033sub add { 1151sub add {
1034 my ($self, $x, $y, $child) = @_; 1152 my ($self, $x, $y, $child) = @_;
1035 1153
1036 $child->set_parent ($self); 1154 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1155 $self->{children}[$y][$x] = $child;
1038 1156
1039 $child->check_size; 1157 $self->check_size (1);
1040} 1158}
1041 1159
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1160# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1161sub clear {
1048 my ($self) = @_; 1162 my ($self) = @_;
1049 1163
1050 my @children = $self->children; 1164 my @children = $self->children;
1051 delete $self->{children}; 1165 delete $self->{children};
… …
1053 for (@children) { 1167 for (@children) {
1054 delete $_->{parent}; 1168 delete $_->{parent};
1055 $_->hide; 1169 $_->hide;
1056 } 1170 }
1057 1171
1172 $self->check_size (1);
1058 $self->update; 1173 $self->update;
1059} 1174}
1060 1175
1061sub get_wh { 1176sub get_wh {
1062 my ($self) = @_; 1177 my ($self) = @_;
… …
1094sub size_allocate { 1209sub size_allocate {
1095 my ($self, $w, $h) = @_; 1210 my ($self, $w, $h) = @_;
1096 1211
1097 my ($ws, $hs) = $self->get_wh; 1212 my ($ws, $hs) = $self->get_wh;
1098 1213
1099 my $req_w = sum @$ws; 1214 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1215 my $req_h = (sum @$hs) || 1;
1101 1216
1102 # TODO: nicer code && do row_expand 1217 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1218 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1219 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1220 my $col_expand = (sum @col_expand) || 1;
… …
1466 active_fg => [0, 0, 0], 1581 active_fg => [0, 0, 0],
1467 can_hover => 1, 1582 can_hover => 1,
1468 can_focus => 1, 1583 can_focus => 1,
1469 valign => 0, 1584 valign => 0,
1470 can_events => 1, 1585 can_events => 1,
1586 #text => ...
1471 @_ 1587 @_
1472 ) 1588 )
1473} 1589}
1474 1590
1475sub _set_text { 1591sub _set_text {
… …
1485 $self->{text} = $text; 1601 $self->{text} = $text;
1486 1602
1487 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1489 1605
1490 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1491} 1607}
1492 1608
1493sub set_text { 1609sub set_text {
1494 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1495 1611
… …
1507 my ($self) = @_; 1623 my ($self) = @_;
1508 1624
1509 my ($w, $h) = $self->SUPER::size_request; 1625 my ($w, $h) = $self->SUPER::size_request;
1510 1626
1511 ($w + 1, $h) # add 1 for cursor 1627 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1628}
1519 1629
1520sub key_down { 1630sub key_down {
1521 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1522 1632
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1651 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1652 $self->_emit ('escape');
1543 } elsif ($uni) { 1653 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1655 }
1546 1656
1547 $self->_set_text ($text); 1657 $self->_set_text ($text);
… …
1634 if ($sym == 13) { 1744 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1640 $self->update; 1750 $self->update;
1641 1751
1642 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1692 can_events => 1, 1802 can_events => 1,
1693 @_ 1803 @_
1694 ) 1804 )
1695} 1805}
1696 1806
1807sub activate { }
1808
1697sub button_up { 1809sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1699 1811
1812 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1815}
1705 1816
1706sub _draw { 1817sub _draw {
1707 my ($self) = @_; 1818 my ($self) = @_;
1708 1819
… …
1760 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1761 1872
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1766 } 1877 }
1767} 1878}
1768 1879
1769sub _draw { 1880sub _draw {
1770 my ($self) = @_; 1881 my ($self) = @_;
… …
2045 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2158 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2159 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2160 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2162 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2163 req_h => $::WIDTH / 80,
2053 vertical => 0, 2164 vertical => 0,
2054 can_hover => 1, 2165 can_hover => 1,
2055 inner_pad => .05, 2166 inner_pad => 0.02,
2056 @_ 2167 @_
2057 ); 2168 );
2058 2169
2059 $self->set_value ($self->{range}[0]); 2170 $self->set_value ($self->{range}[0]);
2060 $self->update; 2171 $self->update;
2061 2172
2062 $self 2173 $self
2063} 2174}
2064 2175
2176sub set_range {
2177 my ($self, $range) = @_;
2178
2179 ($range, $self->{range}) = ($self->{range}, $range);
2180
2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2183}
2184
2065sub set_value { 2185sub set_value {
2066 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2067 2187
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2188 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2189
2070 $hi = $lo + 1 if $hi <= $lo; 2190 $hi = $lo + 1 if $hi <= $lo;
2071 2191
2192 $page = $hi - $lo if $page > $hi - $lo;
2193
2072 $value = $lo if $value < $lo; 2194 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2195 $value = $hi - $page if $value > $hi - $page;
2074 2196
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2197 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2198 if $unit;
2077 2199
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2201
2082 if ($value != $old_value) { 2202 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2203 $self->_emit (changed => $value);
2084 $self->update; 2204 $self->update;
2085 } 2205 }
2086} 2206}
2087 2207
2088sub size_request { 2208sub size_request {
… …
2096 2216
2097sub button_down { 2217sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2099 2219
2100 $self->SUPER::button_down ($ev, $x, $y); 2220 $self->SUPER::button_down ($ev, $x, $y);
2221
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223
2101 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
2102} 2225}
2103 2226
2104sub mouse_motion { 2227sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2230 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2231 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2232
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2233 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2234
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2236
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2238 }
2116} 2239}
2117 2240
2118sub update { 2241sub update {
2119 my ($self) = @_; 2242 my ($self) = @_;
2120 2243
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2245 $self->set_value ($self->{range}[0]);
2123 2246
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
2125 2249
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2251
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2252 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2253 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2254
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2255 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2256 $value = $value * $self->{scale} + $self->{offset};
2132 2257
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2258 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2259 $self->{knob_w} = $knob_w;
2140 }); 2260 });
2141 2261
2142 $self->SUPER::update; 2262 $self->SUPER::update;
2143} 2263}
2144 2264
… …
2168 # draw handle 2288 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2289 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2290
2171 glDisable GL_TEXTURE_2D; 2291 glDisable GL_TEXTURE_2D;
2172} 2292}
2293
2294#############################################################################
2295
2296package CFClient::UI::ValSlider;
2297
2298our @ISA = CFClient::UI::HBox::;
2299
2300sub new {
2301 my ($class, %arg) = @_;
2302
2303 my $range = delete $arg{range};
2304
2305 my $self = $class->SUPER::new (
2306 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2307 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2308 to_value => sub { shift },
2309 from_value => sub { shift },
2310 %arg,
2311 );
2312
2313 $self->{slider}->connect (changed => sub {
2314 my ($self, $value) = @_;
2315 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2316 $self->{parent}->emit (changed => $value);
2317 });
2318
2319# $self->{entry}->connect (changed => sub {
2320# my ($self, $value) = @_;
2321# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2322# $self->{parent}->emit (changed => $value);
2323# });
2324
2325 $self->add ($self->{slider}, $self->{entry});
2326
2327 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2328
2329 $self
2330}
2331
2332sub set_range { shift->{slider}->set_range (@_) }
2333sub set_value { shift->{slider}->set_value (@_) }
2173 2334
2174############################################################################# 2335#############################################################################
2175 2336
2176package CFClient::UI::TextView; 2337package CFClient::UI::TextView;
2177 2338
… …
2207 2368
2208 $self->{fontsize} = $fontsize; 2369 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2370 $self->reflow;
2210} 2371}
2211 2372
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2373sub size_allocate {
2232 my ($self, $w, $h) = @_; 2374 my ($self, $w, $h) = @_;
2233 2375
2234 $self->SUPER::size_allocate ($w, $h); 2376 $self->SUPER::size_allocate ($w, $h);
2235 2377
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2380 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2381
2240 $self->reflow; 2382 $self->reflow;
2241} 2383}
2242 2384
2385sub text_size {
2386 my ($self, $text, $indent) = @_;
2387
2388 my $layout = $self->{layout};
2389
2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $layout->set_width ($self->{children}[0]{w} - $indent);
2392 $layout->set_markup ($text);
2393
2394 $layout->size
2395}
2396
2397sub reflow {
2398 my ($self) = @_;
2399
2400 $self->{need_reflow}++;
2401 $self->update;
2402}
2403
2404sub set_offset {
2405 my ($self, $offset) = @_;
2406
2407 # todo: base offset on lines or so, not on pixels
2408 $self->{children}[1]->set_value ($offset);
2409}
2410
2411sub clear {
2412 my ($self) = @_;
2413
2414 $self->{par} = [];
2415 $self->{height} = 0;
2416 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2417}
2418
2243sub add_paragraph { 2419sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2420 my ($self, $color, $text, $indent) = @_;
2245 2421
2246 #TODO: intelligently "reformat" paragraph 2422 for my $line (split /\n/, $text) {
2247 2423 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2424 $self->{height} += $h;
2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2426 }
2251 2427
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2428 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2429}
2257 2430
2258sub update { 2431sub update {
2259 my ($self) = @_; 2432 my ($self) = @_;
2260 2433
… …
2263 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
2264 2437
2265 delete $self->{texture}; 2438 delete $self->{texture};
2266 2439
2267 $ROOT->on_post_alloc ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
2268 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2444 my $height = 0;
2270 2445
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
2272 for @{$self->{par}}; 2450 for (@{$self->{par}}) {
2451 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2452 $layout->set_width ($W - $_->[3]);
2453 $layout->set_markup ($_->[4]);
2454 my ($w, $h) = $layout->size;
2455 $_->[0] = $w + $_->[3];
2456 $_->[1] = $h;
2457 }
2458
2459 $height += $_->[1];
2460 }
2273 2461
2274 $self->{height} = $height; 2462 $self->{height} = $height;
2275 2463
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2465
2278 delete $self->{texture}; 2466 delete $self->{texture};
2279 } 2467 }
2280 2468
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2284 2472
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2473 my $top = int $self->{children}[1]{range}[0];
2289 2474
2290 my $y0 = $top; 2475 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2476 my $y1 = $top + $H;
2292 2477
2293 my $y = 0; 2478 my $y = 0;
2294 2479
2295 my $layout = $self->{layout}; 2480 my $layout = $self->{layout};
2296 2481
2297 $layout->set_font ($self->{font}) if $self->{font}; 2482 $layout->set_font ($self->{font}) if $self->{font};
2298 2483
2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2487
2299 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2489 my $h = $par->[1];
2301 2490
2302 if ($y0 < $y + $h && $y < $y1) { 2491 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2492 $layout->set_foreground (@{ $par->[2] });
2493 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2494 $layout->set_markup ($par->[4]);
2305 2495
2306 my ($W, $H) = $layout->size; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2497
2498 glRasterPos $par->[3], $y - $y0;
2499 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2500 }
2309 2501
2310 $y += $h; 2502 $y += $h;
2311 } 2503 }
2312 2504
2313 glDisable GL_TEXTURE_2D; 2505 glDisable GL_BLEND;
2314 }; 2506 };
2315 }); 2507 });
2316} 2508}
2317 2509
2318sub _draw { 2510sub _draw {
… …
2398 2590
2399 # TODO: use animation 2591 # TODO: use animation
2400 if ($self->{state} = !$self->{state}) { 2592 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other}); 2593 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h})); 2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open"); 2595 $self->_emit ("open");
2404 } else { 2596 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other}); 2597 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close"); 2598 $self->_emit ("close");
2407 } 2599 }
2408 2600
2409 $self->emit (changed => $self->{state}); 2601 $self->_emit (changed => $self->{state});
2410} 2602}
2411 2603
2412############################################################################# 2604#############################################################################
2413 2605
2414package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2489use CFClient::OpenGL; 2681use CFClient::OpenGL;
2490 2682
2491sub new { 2683sub new {
2492 my $class = shift; 2684 my $class = shift;
2493 2685
2494 $class->SUPER::new ( 2686 my $self = $class->SUPER::new (
2495 aspect => 1, 2687 aspect => 1,
2688 can_events => 0,
2496 @_, 2689 @_,
2497 ) 2690 );
2691
2692 if ($self->{anim} && $self->{animspeed}) {
2693 Scalar::Util::weaken (my $widget = $self);
2694
2695 $self->{timer} = Event->timer (
2696 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2697 hard => 1,
2698 interval => $self->{animspeed},
2699 cb => sub {
2700 ++$widget->{frame};
2701 $widget->update;
2702 },
2703 );
2704 }
2705
2706 $self
2498} 2707}
2499 2708
2500sub size_request { 2709sub size_request {
2501 (32, 8) 2710 (32, 8)
2502} 2711}
2503 2712
2713sub update {
2714 my ($self) = @_;
2715
2716 return unless $self->{visible};
2717
2718 $self->SUPER::update;
2719}
2720
2504sub _draw { 2721sub _draw {
2505 my ($self) = @_; 2722 my ($self) = @_;
2506 2723
2507 return unless $::CONN;#d# manage and cache textures differently 2724 return unless $::CONN;
2725
2726 my $face;
2727
2728 if ($self->{frame}) {
2729 my $anim = $::CONN->{anim}[$self->{anim}];
2730
2731 $face = $anim->[ $self->{frame} % @$anim ]
2732 if $anim && @$anim;
2733 }
2734
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2735 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2736
2510 # TODO animation
2511 if ($tex) { 2737 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2738 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2739 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2740 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2741 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2742 glDisable GL_TEXTURE_2D;
2517 } 2743 }
2518} 2744}
2519 2745
2746sub DESTROY {
2747 my ($self) = @_;
2748
2749 $self->{timer}->cancel
2750 if $self->{timer};
2751
2752 $self->SUPER::DESTROY;
2753}
2754
2520############################################################################# 2755#############################################################################
2521 2756
2522package CFClient::UI::InventoryItem; 2757package CFClient::UI::Inventory;
2523 2758
2524our @ISA = CFClient::UI::HBox::; 2759our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $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 $desc
2550}
2551 2760
2552sub new { 2761sub new {
2553 my $class = shift; 2762 my $class = shift;
2554 2763
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new ( 2764 my $self = $class->SUPER::new (
2562 can_hover => 1, 2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_, 2766 @_,
2637 ); 2767 );
2638 2768
2639 $self 2769 $self
2640} 2770}
… …
2650 or ($a->{name} cmp $b->{name}) 2780 or ($a->{name} cmp $b->{name})
2651 } @$items; 2781 } @$items;
2652 2782
2653 $self->{real_items} = \@items; 2783 $self->{real_items} = \@items;
2654 2784
2785 my $row = 0;
2655 for my $item (@items) { 2786 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2787 CFClient::Item::update_widgets $item;
2657 $item->update_item ();
2658 }
2659 2788
2660 $self->{scrolled}->add (@items); 2789 $self->{scrolled}->add (0, $row, $item->{face_widget});
2790 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2791 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2661 2792
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2793 $row++;
2794 }
2663} 2795}
2664 2796
2665sub size_request { 2797sub size_request {
2666 my ($self) = @_; 2798 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h}); 2799 ($self->{req_w}, $self->{req_h});
… …
2707 2839
2708# popup given the event (must be a mouse button down event currently) 2840# popup given the event (must be a mouse button down event currently)
2709sub popup { 2841sub popup {
2710 my ($self, $ev) = @_; 2842 my ($self, $ev) = @_;
2711 2843
2712 $self->emit ("popdown"); 2844 $self->_emit ("popdown");
2713 2845
2714 # maybe save $GRAB? must be careful about events... 2846 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2847 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2848 $self->{button} = $ev->{button};
2717 2849
… …
2732 2864
2733 if ($ev->{button} == $self->{button}) { 2865 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2866 undef $GRAB;
2735 $self->hide; 2867 $self->hide;
2736 2868
2737 $self->emit ("popdown"); 2869 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2870 $self->{hover}[1]->() if $self->{hover};
2739 } 2871 }
2740} 2872}
2741 2873
2742############################################################################# 2874#############################################################################
… …
2804sub add { 2936sub add {
2805 my ($self, $text, %arg) = @_; 2937 my ($self, $text, %arg) = @_;
2806 2938
2807 $text =~ s/^\s+//; 2939 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2940 $text =~ s/\s+$//;
2941
2942 return unless $text;
2809 2943
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2944 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2945
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2946 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2947
… …
2857 2991
2858sub new { 2992sub new {
2859 my $class = shift; 2993 my $class = shift;
2860 2994
2861 $class->SUPER::new ( 2995 $class->SUPER::new (
2996 visible => 1,
2862 @_, 2997 @_,
2863 ) 2998 )
2864} 2999}
2865 3000
2866sub configure { 3001sub configure {
… …
2884} 3019}
2885 3020
2886sub size_allocate { 3021sub size_allocate {
2887 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h) = @_;
2888 3023
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3024 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3026
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x}; 3028 if exists $child->{req_x};
… …
2928} 3057}
2929 3058
2930sub add { 3059sub add {
2931 my ($self, @children) = @_; 3060 my ($self, @children) = @_;
2932 3061
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067
2933 for my $child (@children) { 3068 for my $child (@children) {
2934 $child->{toplevel} = 1; 3069 $child->{is_toplevel} = 1;
2935 3070
2936 # integerise window positions 3071 # integerise window positions
2937 $child->{x} = int $child->{x}; 3072 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y}; 3073 $child->{y} = int $child->{y};
2939 } 3074 }
2940 3075
2941 $self->SUPER::add (@children); 3076 $self->SUPER::add (@children);
3077}
3078
3079sub remove {
3080 my ($self, @children) = @_;
3081
3082 $self->SUPER::remove (@children);
3083
3084 while (@children) {
3085 my $w = pop @children;
3086 push @children, $w->children;
3087 $w->set_invisible;
3088 }
2942} 3089}
2943 3090
2944sub on_refresh { 3091sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3092 my ($self, $id, $cb) = @_;
2946 3093
… …
2999 $w = 0 if $w < 0; 3146 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3147 $h = 0 if $h < 0;
3001 3148
3002 $widget->{w} = $w; 3149 $widget->{w} = $w;
3003 $widget->{h} = $h; 3150 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h); 3151 $widget->emit (size_allocate => $w, $h);
3006 } 3152 }
3007 } 3153 }
3008 3154
3009 while ($self->{post_alloc_hook}) { 3155 while ($self->{post_alloc_hook}) {
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3162 glClear GL_COLOR_BUFFER_BIT;
3017 3163
3018 glMatrixMode GL_PROJECTION; 3164 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3165 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3166 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3167 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3168 glLoadIdentity;
3023 3169
3024 $self->_draw; 3170 $self->_draw;
3025} 3171}

Diff Legend

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