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.220 by root, Mon May 22 03:28:55 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) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 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
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $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};
159 $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};
160 $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};
161 $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};
162 $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};
163 $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};
164 $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};
165 $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};
166 } 185 }
167
168 $widget->reconfigure;
169 } 186 }
187
188 reconfigure_widgets;
170} 189}
171 190
172############################################################################# 191#############################################################################
173 192
174package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
194 } 213 }
195 } 214 }
196 215
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 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
199 $self 225 $self
200} 226}
201 227
202sub destroy { 228sub destroy {
203 my ($self) = @_; 229 my ($self) = @_;
… …
206 %$self = (); 232 %$self = ();
207} 233}
208 234
209sub show { 235sub show {
210 my ($self) = @_; 236 my ($self) = @_;
211
212 return if $self->{parent}; 237 return if $self->{parent};
213 238
214 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
215} 240}
216 241
217sub hide { 242sub show_centered {
218 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};
219 262
220 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
221 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;
222 276
223 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
224 if $self->{parent}; 278 if $self->{parent};
225} 279}
226 280
… …
296} 350}
297 351
298sub set_tooltip { 352sub set_tooltip {
299 my ($self, $tooltip) = @_; 353 my ($self, $tooltip) = @_;
300 354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
301 $self->{tooltip} = $tooltip; 360 $self->{tooltip} = $tooltip;
302 361
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 363 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 364 CFClient::UI::check_tooltip;
… …
326 return if $FOCUS == $self; 385 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
328 387
329 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
330 389
331 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
332 391
333 $focus->update if $focus; 392 $focus->update if $focus;
334 $FOCUS->update; 393 $FOCUS->update;
335} 394}
336 395
… …
339 398
340 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
341 400
342 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
343 402
344 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
345 404
346 $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;
347} 409}
348 410
349sub mouse_motion { } 411sub mouse_motion { }
350sub button_up { } 412sub button_up { }
351sub key_down { } 413sub key_down { }
352sub key_up { } 414sub key_up { }
353 415
354sub button_down { 416sub button_down {
355 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
356 418
357 $self->focus_in; 419 $self->focus_in;
… …
391 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix; 454 glPushMatrix;
393 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 458 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
398 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
399 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
400 glEnd; 462 glEnd;
401 glPopMatrix; 463 glPopMatrix;
402 #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;
403 } 465 }
404} 466}
… …
424sub set_parent { 486sub set_parent {
425 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
426 488
427 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
428 490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
429 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size 495 $self->check_size
431 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
497
498 $self->show;
432} 499}
433 500
434sub check_size { 501sub check_size {
435 my ($self, $forced) = @_; 502 my ($self, $forced) = @_;
436 503
… …
449 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
450 517
451 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
452} 519}
453 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
454sub emit { 527sub emit {
455 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
456 529
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
458} 532}
459 533
460sub DESTROY { 534sub DESTROY {
461 my ($self) = @_; 535 my ($self) = @_;
462 536
… …
575 delete $child->{parent}; 649 delete $child->{parent};
576 $child->hide; 650 $child->hide;
577 651
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 653
580 $self->check_size; 654 $self->check_size (1);
581 $self->update; 655 $self->update;
582} 656}
583 657
584sub clear { 658sub clear {
585 my ($self) = @_; 659 my ($self) = @_;
… …
725 799
726package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
727 801
728our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
729 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
730sub size_request { 814sub size_request {
731 my ($self) = @_; 815 my ($self) = @_;
732 816
733 @$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)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 818
736 @$self{qw(child_w child_h)} 819 @$self{qw(child_w child_h)}
737} 820}
738 821
739sub size_allocate { 822sub size_allocate {
740 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
741 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);
742 $self->update; 829 $self->update;
743} 830}
744 831
745sub set_offset { 832sub set_offset {
746 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
800 887
801 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
802 vertical => 1, 889 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 891 connect_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 892 $self->{vp}->set_offset (0, $_[1]);
806 }, 893 },
807 ; 894 ;
808 895
809 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 897 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
818 905
819 $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]);
820} 926}
821 927
822#TODO# update range on size_allocate depending on child 928#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 929# update viewport offset on scroll
824 930
… …
878 my $class = shift; 984 my $class = shift;
879 985
880 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
881 987
882 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
885 border => 0.6, 991 border => 0.6,
886 toplevel => 1, 992 is_toplevel => 1,
887 can_events => 1, 993 can_events => 1,
888 @_ 994 @_
889 ); 995 );
890 996
891 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
892 align => 0, 998 align => 0,
… …
1032sub new { 1138sub new {
1033 my $class = shift; 1139 my $class = shift;
1034 1140
1035 $class->SUPER::new ( 1141 $class->SUPER::new (
1036 col_expand => [], 1142 col_expand => [],
1037 @_ 1143 @_,
1038 ) 1144 )
1145}
1146
1147sub children {
1148 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1149}
1040 1150
1041sub add { 1151sub add {
1042 my ($self, $x, $y, $child) = @_; 1152 my ($self, $x, $y, $child) = @_;
1043 1153
1044 $child->set_parent ($self); 1154 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1155 $self->{children}[$y][$x] = $child;
1046 1156
1047 $child->check_size; 1157 $self->check_size (1);
1048} 1158}
1049 1159
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# 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?
1055sub clear { 1161sub clear {
1056 my ($self) = @_; 1162 my ($self) = @_;
1057 1163
1058 my @children = $self->children; 1164 my @children = $self->children;
1059 delete $self->{children}; 1165 delete $self->{children};
… …
1061 for (@children) { 1167 for (@children) {
1062 delete $_->{parent}; 1168 delete $_->{parent};
1063 $_->hide; 1169 $_->hide;
1064 } 1170 }
1065 1171
1172 $self->check_size (1);
1066 $self->update; 1173 $self->update;
1067} 1174}
1068 1175
1069sub get_wh { 1176sub get_wh {
1070 my ($self) = @_; 1177 my ($self) = @_;
… …
1102sub size_allocate { 1209sub size_allocate {
1103 my ($self, $w, $h) = @_; 1210 my ($self, $w, $h) = @_;
1104 1211
1105 my ($ws, $hs) = $self->get_wh; 1212 my ($ws, $hs) = $self->get_wh;
1106 1213
1107 my $req_w = sum @$ws; 1214 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1215 my $req_h = (sum @$hs) || 1;
1109 1216
1110 # TODO: nicer code && do row_expand 1217 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1218 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1219 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1220 my $col_expand = (sum @col_expand) || 1;
… …
1474 active_fg => [0, 0, 0], 1581 active_fg => [0, 0, 0],
1475 can_hover => 1, 1582 can_hover => 1,
1476 can_focus => 1, 1583 can_focus => 1,
1477 valign => 0, 1584 valign => 0,
1478 can_events => 1, 1585 can_events => 1,
1586 #text => ...
1479 @_ 1587 @_
1480 ) 1588 )
1481} 1589}
1482 1590
1483sub _set_text { 1591sub _set_text {
… …
1493 $self->{text} = $text; 1601 $self->{text} = $text;
1494 1602
1495 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1497 1605
1498 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1499} 1607}
1500 1608
1501sub set_text { 1609sub set_text {
1502 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1503 1611
… …
1515 my ($self) = @_; 1623 my ($self) = @_;
1516 1624
1517 my ($w, $h) = $self->SUPER::size_request; 1625 my ($w, $h) = $self->SUPER::size_request;
1518 1626
1519 ($w + 1, $h) # add 1 for cursor 1627 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1628}
1527 1629
1528sub key_down { 1630sub key_down {
1529 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1530 1632
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1651 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1652 $self->_emit ('escape');
1551 } elsif ($uni) { 1653 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1553 } 1655 }
1554 1656
1555 $self->_set_text ($text); 1657 $self->_set_text ($text);
… …
1642 if ($sym == 13) { 1744 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1648 $self->update; 1750 $self->update;
1649 1751
1650 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1700 can_events => 1, 1802 can_events => 1,
1701 @_ 1803 @_
1702 ) 1804 )
1703} 1805}
1704 1806
1807sub activate { }
1808
1705sub button_up { 1809sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1707 1811
1812 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate");
1711 }
1712} 1815}
1713 1816
1714sub _draw { 1817sub _draw {
1715 my ($self) = @_; 1818 my ($self) = @_;
1716 1819
… …
1768 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1769 1872
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1772 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1774 } 1877 }
1775} 1878}
1776 1879
1777sub _draw { 1880sub _draw {
1778 my ($self) = @_; 1881 my ($self) = @_;
… …
2053 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2158 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2159 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2160 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2162 req_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2163 req_h => $::WIDTH / 80,
2061 vertical => 0, 2164 vertical => 0,
2062 can_hover => 1, 2165 can_hover => 1,
2063 inner_pad => 0.02, 2166 inner_pad => 0.02,
… …
2068 $self->update; 2171 $self->update;
2069 2172
2070 $self 2173 $self
2071} 2174}
2072 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
2073sub set_value { 2185sub set_value {
2074 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2075 2187
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2188 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2189
2078 $hi = $lo + 1 if $hi <= $lo; 2190 $hi = $lo + 1 if $hi <= $lo;
2079 2191
2192 $page = $hi - $lo if $page > $hi - $lo;
2193
2080 $value = $lo if $value < $lo; 2194 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2195 $value = $hi - $page if $value > $hi - $page;
2082 2196
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2197 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2198 if $unit;
2085 2199
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2201
2090 if ($value != $old_value) { 2202 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2203 $self->_emit (changed => $value);
2092 $self->update; 2204 $self->update;
2093 } 2205 }
2094} 2206}
2095 2207
2096sub size_request { 2208sub size_request {
… …
2104 2216
2105sub button_down { 2217sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2107 2219
2108 $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
2109 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
2110} 2225}
2111 2226
2112sub mouse_motion { 2227sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
… …
2115 if ($GRAB == $self) { 2230 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2231 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2232
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2233 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2234
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2236
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123 } 2238 }
2124} 2239}
2125 2240
2126sub update { 2241sub update {
2127 my ($self) = @_; 2242 my ($self) = @_;
2128 2243
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2245 $self->set_value ($self->{range}[0]);
2131 2246
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
2133 2249
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2251
2136 $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;
2137 2254
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2255 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2256 $value = $value * $self->{scale} + $self->{offset};
2140 2257
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2258 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2259 $self->{knob_w} = $knob_w;
2148 }); 2260 });
2149 2261
2150 $self->SUPER::update; 2262 $self->SUPER::update;
2151} 2263}
2152 2264
… …
2176 # draw handle 2288 # draw handle
2177 $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);
2178 2290
2179 glDisable GL_TEXTURE_2D; 2291 glDisable GL_TEXTURE_2D;
2180} 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 (@_) }
2181 2334
2182############################################################################# 2335#############################################################################
2183 2336
2184package CFClient::UI::TextView; 2337package CFClient::UI::TextView;
2185 2338
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2380 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2381
2229 $self->reflow; 2382 $self->reflow;
2230} 2383}
2231 2384
2232sub text_height { 2385sub text_size {
2233 my ($self, $text, $indent) = @_; 2386 my ($self, $text, $indent) = @_;
2234 2387
2235 my $layout = $self->{layout}; 2388 my $layout = $self->{layout};
2236 2389
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2391 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2392 $layout->set_markup ($text);
2240 2393
2241 ($layout->size)[1] 2394 $layout->size
2242} 2395}
2243 2396
2244sub reflow { 2397sub reflow {
2245 my ($self) = @_; 2398 my ($self) = @_;
2246 2399
2247 $self->{need_reflow}++; 2400 $self->{need_reflow}++;
2248 $self->update; 2401 $self->update;
2249} 2402}
2250 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
2251sub add_paragraph { 2419sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2420 my ($self, $color, $text, $indent) = @_;
2253 2421
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2422 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2423 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2424 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2426 }
2261 2427
2262 $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]);
2263 $self->{children}[1]->update;
2264} 2429}
2265 2430
2266sub update { 2431sub update {
2267 my ($self) = @_; 2432 my ($self) = @_;
2268 2433
… …
2271 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
2272 2437
2273 delete $self->{texture}; 2438 delete $self->{texture};
2274 2439
2275 $ROOT->on_post_alloc ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
2276 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2444 my $height = 0;
2278 2445
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
2280 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 }
2281 2461
2282 $self->{height} = $height; 2462 $self->{height} = $height;
2283 2463
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2465
2287 delete $self->{texture}; 2466 delete $self->{texture};
2288 } 2467 }
2289 2468
2290 $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 {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2293 2472
2294 my $top = int $self->{children}[1]{range}[0]; 2473 my $top = int $self->{children}[1]{range}[0];
2295 2474
2296 my $y0 = $top; 2475 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2476 my $y1 = $top + $H;
2298 2477
2299 my $y = 0; 2478 my $y = 0;
2300 2479
2301 my $layout = $self->{layout}; 2480 my $layout = $self->{layout};
2302 2481
2303 $layout->set_font ($self->{font}) if $self->{font}; 2482 $layout->set_font ($self->{font}) if $self->{font};
2304 2483
2305 glEnable GL_BLEND; 2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2487
2308 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2489 my $h = $par->[1];
2310 2490
2311 if ($y0 < $y + $h && $y < $y1) { 2491 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2492 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2493 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2494 $layout->set_markup ($par->[4]);
2315 2495
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2497
2318 glRasterPos $par->[2], $y - $y0; 2498 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2499 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2500 }
2321 2501
2322 $y += $h; 2502 $y += $h;
2323 } 2503 }
… …
2410 2590
2411 # TODO: use animation 2591 # TODO: use animation
2412 if ($self->{state} = !$self->{state}) { 2592 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other}); 2593 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h})); 2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open"); 2595 $self->_emit ("open");
2416 } else { 2596 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other}); 2597 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close"); 2598 $self->_emit ("close");
2419 } 2599 }
2420 2600
2421 $self->emit (changed => $self->{state}); 2601 $self->_emit (changed => $self->{state});
2422} 2602}
2423 2603
2424############################################################################# 2604#############################################################################
2425 2605
2426package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2502 2682
2503sub new { 2683sub new {
2504 my $class = shift; 2684 my $class = shift;
2505 2685
2506 my $self = $class->SUPER::new ( 2686 my $self = $class->SUPER::new (
2507 aspect => 1, 2687 aspect => 1,
2688 can_events => 0,
2508 @_, 2689 @_,
2509 ); 2690 );
2510 2691
2511 if ($self->{anim} && $self->{animspeed}) { 2692 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2693 Scalar::Util::weaken (my $widget = $self);
… …
2527 2708
2528sub size_request { 2709sub size_request {
2529 (32, 8) 2710 (32, 8)
2530} 2711}
2531 2712
2713sub update {
2714 my ($self) = @_;
2715
2716 return unless $self->{visible};
2717
2718 $self->SUPER::update;
2719}
2720
2532sub _draw { 2721sub _draw {
2533 my ($self) = @_; 2722 my ($self) = @_;
2534 2723
2535 return unless $::CONN;#d# manage and cache textures differently 2724 return unless $::CONN;
2536 2725
2537 my $face; 2726 my $face;
2538 2727
2539 if ($self->{frame}) { 2728 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2729 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2563 $self->SUPER::DESTROY; 2752 $self->SUPER::DESTROY;
2564} 2753}
2565 2754
2566############################################################################# 2755#############################################################################
2567 2756
2568package CFClient::UI::InventoryItem; 2757package CFClient::UI::Inventory;
2569 2758
2570our @ISA = CFClient::UI::HBox::; 2759our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub _item_to_desc {
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597 2760
2598sub new { 2761sub new {
2599 my $class = shift; 2762 my $class = shift;
2600 2763
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new ( 2764 my $self = $class->SUPER::new (
2608 can_hover => 1, 2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_, 2766 @_,
2688 ); 2767 );
2689 2768
2690 $self 2769 $self
2691} 2770}
… …
2701 or ($a->{name} cmp $b->{name}) 2780 or ($a->{name} cmp $b->{name})
2702 } @$items; 2781 } @$items;
2703 2782
2704 $self->{real_items} = \@items; 2783 $self->{real_items} = \@items;
2705 2784
2785 my $row = 0;
2706 for my $item (@items) { 2786 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2787 CFClient::Item::update_widgets $item;
2708 $item->update_item ();
2709 }
2710 2788
2711 $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});
2712 2792
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2793 $row++;
2794 }
2714} 2795}
2715 2796
2716sub size_request { 2797sub size_request {
2717 my ($self) = @_; 2798 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h}); 2799 ($self->{req_w}, $self->{req_h});
… …
2758 2839
2759# 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)
2760sub popup { 2841sub popup {
2761 my ($self, $ev) = @_; 2842 my ($self, $ev) = @_;
2762 2843
2763 $self->emit ("popdown"); 2844 $self->_emit ("popdown");
2764 2845
2765 # maybe save $GRAB? must be careful about events... 2846 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2847 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2848 $self->{button} = $ev->{button};
2768 2849
… …
2783 2864
2784 if ($ev->{button} == $self->{button}) { 2865 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2866 undef $GRAB;
2786 $self->hide; 2867 $self->hide;
2787 2868
2788 $self->emit ("popdown"); 2869 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2870 $self->{hover}[1]->() if $self->{hover};
2790 } 2871 }
2791} 2872}
2792 2873
2793############################################################################# 2874#############################################################################
… …
2855sub add { 2936sub add {
2856 my ($self, $text, %arg) = @_; 2937 my ($self, $text, %arg) = @_;
2857 2938
2858 $text =~ s/^\s+//; 2939 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 2940 $text =~ s/\s+$//;
2941
2942 return unless $text;
2860 2943
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 2944 my $timeout = time + ((delete $arg{timeout}) || 60);
2862 2945
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2946 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 2947
… …
2908 2991
2909sub new { 2992sub new {
2910 my $class = shift; 2993 my $class = shift;
2911 2994
2912 $class->SUPER::new ( 2995 $class->SUPER::new (
2996 visible => 1,
2913 @_, 2997 @_,
2914 ) 2998 )
2915} 2999}
2916 3000
2917sub configure { 3001sub configure {
… …
2935} 3019}
2936 3020
2937sub size_allocate { 3021sub size_allocate {
2938 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h) = @_;
2939 3023
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 3024 for my $child ($self->children) {
2947 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)};
2948 3026
2949 $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
2950 if exists $child->{req_x}; 3028 if exists $child->{req_x};
… …
2979} 3057}
2980 3058
2981sub add { 3059sub add {
2982 my ($self, @children) = @_; 3060 my ($self, @children) = @_;
2983 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
2984 for my $child (@children) { 3068 for my $child (@children) {
2985 $child->{toplevel} = 1; 3069 $child->{is_toplevel} = 1;
2986 3070
2987 # integerise window positions 3071 # integerise window positions
2988 $child->{x} = int $child->{x}; 3072 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y}; 3073 $child->{y} = int $child->{y};
2990 } 3074 }
2991 3075
2992 $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 }
2993} 3089}
2994 3090
2995sub on_refresh { 3091sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3092 my ($self, $id, $cb) = @_;
2997 3093
… …
3050 $w = 0 if $w < 0; 3146 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3147 $h = 0 if $h < 0;
3052 3148
3053 $widget->{w} = $w; 3149 $widget->{w} = $w;
3054 $widget->{h} = $h; 3150 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h);
3056 $widget->emit (size_allocate => $w, $h); 3151 $widget->emit (size_allocate => $w, $h);
3057 } 3152 }
3058 } 3153 }
3059 3154
3060 while ($self->{post_alloc_hook}) { 3155 while ($self->{post_alloc_hook}) {

Diff Legend

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