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.229 by root, Wed May 24 21:49:58 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) = @_;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 251 },
226 ); 252 );
227} 253}
228 254
229sub hide { 255sub set_invisible {
230 my ($self) = @_; 256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
231 262
232 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
233 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;
234 276
235 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
236 if $self->{parent}; 278 if $self->{parent};
237} 279}
238 280
… …
308} 350}
309 351
310sub set_tooltip { 352sub set_tooltip {
311 my ($self, $tooltip) = @_; 353 my ($self, $tooltip) = @_;
312 354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
313 $self->{tooltip} = $tooltip; 360 $self->{tooltip} = $tooltip;
314 361
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 363 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 364 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 385 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
340 387
341 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
342 389
343 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
344 391
345 $focus->update if $focus; 392 $focus->update if $focus;
346 $FOCUS->update; 393 $FOCUS->update;
347} 394}
348 395
… …
351 398
352 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
353 400
354 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
355 402
356 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
357 404
358 $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;
359} 409}
360 410
361sub mouse_motion { } 411sub mouse_motion { }
362sub button_up { } 412sub button_up { }
363sub key_down { } 413sub key_down { }
364sub key_up { } 414sub key_up { }
365 415
366sub button_down { 416sub button_down {
367 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
368 418
369 $self->focus_in; 419 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 454 glPushMatrix;
405 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 458 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
412 glEnd; 462 glEnd;
413 glPopMatrix; 463 glPopMatrix;
414 #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;
415 } 465 }
416} 466}
… …
436sub set_parent { 486sub set_parent {
437 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
438 488
439 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
440 490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
441 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 495 $self->check_size
443 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
444 497
445 $self->show; 498 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
464 517
465 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 519}
467 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
468sub emit { 527sub emit {
469 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
470 529
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
472} 532}
473 533
474sub DESTROY { 534sub DESTROY {
475 my ($self) = @_; 535 my ($self) = @_;
476 536
… …
589 delete $child->{parent}; 649 delete $child->{parent};
590 $child->hide; 650 $child->hide;
591 651
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 653
594 $self->check_size; 654 $self->check_size (1);
595 $self->update; 655 $self->update;
596} 656}
597 657
598sub clear { 658sub clear {
599 my ($self) = @_; 659 my ($self) = @_;
… …
739 799
740package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
741 801
742our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
743 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
744sub size_request { 814sub size_request {
745 my ($self) = @_; 815 my ($self) = @_;
746 816
747 @$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)};
748 818
… …
750} 820}
751 821
752sub size_allocate { 822sub size_allocate {
753 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
754 824
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
757 $self->child->configure (0, 0, $cw, $ch); 828 $self->child->configure (0, 0, $w, $h);
758 $self->update; 829 $self->update;
759} 830}
760 831
761sub set_offset { 832sub set_offset {
762 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
833 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
834 905
835 $self 906 $self
836} 907}
837 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
838sub size_allocate { 919sub size_allocate {
839 my ($self, $w, $h) = @_; 920 my ($self, $w, $h) = @_;
840 921
841 $self->SUPER::size_allocate ($w, $h); 922 $self->SUPER::size_allocate ($w, $h);
842 923
… …
903 my $class = shift; 984 my $class = shift;
904 985
905 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
906 987
907 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
910 border => 0.6, 991 border => 0.6,
911 toplevel => 1, 992 is_toplevel => 1,
912 can_events => 1, 993 can_events => 1,
913 @_ 994 @_
914 ); 995 );
915 996
916 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
917 align => 0, 998 align => 0,
… …
1057sub new { 1138sub new {
1058 my $class = shift; 1139 my $class = shift;
1059 1140
1060 $class->SUPER::new ( 1141 $class->SUPER::new (
1061 col_expand => [], 1142 col_expand => [],
1062 @_ 1143 @_,
1063 ) 1144 )
1145}
1146
1147sub children {
1148 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1149}
1065 1150
1066sub add { 1151sub add {
1067 my ($self, $x, $y, $child) = @_; 1152 my ($self, $x, $y, $child) = @_;
1068 1153
1069 $child->set_parent ($self); 1154 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1155 $self->{children}[$y][$x] = $child;
1071 1156
1072 $child->check_size; 1157 $self->check_size (1);
1073} 1158}
1074 1159
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1161sub clear {
1081 my ($self) = @_; 1162 my ($self) = @_;
1082 1163
1083 my @children = $self->children; 1164 my @children = $self->children;
1084 delete $self->{children}; 1165 delete $self->{children};
… …
1086 for (@children) { 1167 for (@children) {
1087 delete $_->{parent}; 1168 delete $_->{parent};
1088 $_->hide; 1169 $_->hide;
1089 } 1170 }
1090 1171
1172 $self->check_size (1);
1091 $self->update; 1173 $self->update;
1092} 1174}
1093 1175
1094sub get_wh { 1176sub get_wh {
1095 my ($self) = @_; 1177 my ($self) = @_;
… …
1127sub size_allocate { 1209sub size_allocate {
1128 my ($self, $w, $h) = @_; 1210 my ($self, $w, $h) = @_;
1129 1211
1130 my ($ws, $hs) = $self->get_wh; 1212 my ($ws, $hs) = $self->get_wh;
1131 1213
1132 my $req_w = sum @$ws; 1214 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1215 my $req_h = (sum @$hs) || 1;
1134 1216
1135 # TODO: nicer code && do row_expand 1217 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1218 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1219 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1220 my $col_expand = (sum @col_expand) || 1;
… …
1519 $self->{text} = $text; 1601 $self->{text} = $text;
1520 1602
1521 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1523 1605
1524 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1525} 1607}
1526 1608
1527sub set_text { 1609sub set_text {
1528 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1529 1611
… …
1541 my ($self) = @_; 1623 my ($self) = @_;
1542 1624
1543 my ($w, $h) = $self->SUPER::size_request; 1625 my ($w, $h) = $self->SUPER::size_request;
1544 1626
1545 ($w + 1, $h) # add 1 for cursor 1627 ($w + 1, $h) # add 1 for cursor
1546}
1547
1548sub size_allocate {
1549 my ($self, $w, $h) = @_;
1550
1551 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1552} 1628}
1553 1629
1554sub key_down { 1630sub key_down {
1555 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1556 1632
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1651 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1652 $self->_emit ('escape');
1577 } elsif ($uni) { 1653 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1579 } 1655 }
1580 1656
1581 $self->_set_text ($text); 1657 $self->_set_text ($text);
… …
1668 if ($sym == 13) { 1744 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1674 $self->update; 1750 $self->update;
1675 1751
1676 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1726 can_events => 1, 1802 can_events => 1,
1727 @_ 1803 @_
1728 ) 1804 )
1729} 1805}
1730 1806
1807sub activate { }
1808
1731sub button_up { 1809sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1733 1811
1812 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate");
1737 }
1738} 1815}
1739 1816
1740sub _draw { 1817sub _draw {
1741 my ($self) = @_; 1818 my ($self) = @_;
1742 1819
… …
1794 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1795 1872
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1798 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1800 } 1877 }
1801} 1878}
1802 1879
1803sub _draw { 1880sub _draw {
1804 my ($self) = @_; 1881 my ($self) = @_;
… …
2097} 2174}
2098 2175
2099sub set_range { 2176sub set_range {
2100 my ($self, $range) = @_; 2177 my ($self, $range) = @_;
2101 2178
2102 $self->{range} = $range; 2179 ($range, $self->{range}) = ($self->{range}, $range);
2103 2180
2104 $self->update; 2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2105} 2183}
2106 2184
2107sub set_value { 2185sub set_value {
2108 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2109 2187
… …
2120 if $unit; 2198 if $unit;
2121 2199
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2201
2124 if ($value != $old_value) { 2202 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2203 $self->_emit (changed => $value);
2126 $self->update; 2204 $self->update;
2127 } 2205 }
2128} 2206}
2129 2207
2130sub size_request { 2208sub size_request {
… …
2512 2590
2513 # TODO: use animation 2591 # TODO: use animation
2514 if ($self->{state} = !$self->{state}) { 2592 if ($self->{state} = !$self->{state}) {
2515 $CFClient::UI::ROOT->add ($self->{other}); 2593 $CFClient::UI::ROOT->add ($self->{other});
2516 $self->{other}->move ($self->coord2global (0, $self->{h})); 2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2517 $self->emit ("open"); 2595 $self->_emit ("open");
2518 } else { 2596 } else {
2519 $CFClient::UI::ROOT->remove ($self->{other}); 2597 $CFClient::UI::ROOT->remove ($self->{other});
2520 $self->emit ("close"); 2598 $self->_emit ("close");
2521 } 2599 }
2522 2600
2523 $self->emit (changed => $self->{state}); 2601 $self->_emit (changed => $self->{state});
2524} 2602}
2525 2603
2526############################################################################# 2604#############################################################################
2527 2605
2528package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2604 2682
2605sub new { 2683sub new {
2606 my $class = shift; 2684 my $class = shift;
2607 2685
2608 my $self = $class->SUPER::new ( 2686 my $self = $class->SUPER::new (
2609 aspect => 1, 2687 aspect => 1,
2688 can_events => 0,
2610 @_, 2689 @_,
2611 ); 2690 );
2612 2691
2613 if ($self->{anim} && $self->{animspeed}) { 2692 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2693 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2752 $self->SUPER::DESTROY;
2674} 2753}
2675 2754
2676############################################################################# 2755#############################################################################
2677 2756
2678package CFClient::UI::InventoryItem; 2757package CFClient::UI::Inventory;
2679 2758
2680our @ISA = CFClient::UI::HBox::; 2759our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub _item_to_desc {
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2707 2760
2708sub new { 2761sub new {
2709 my $class = shift; 2762 my $class = shift;
2710 2763
2711 my %args = @_;
2712
2713 my $item = delete $args{item};
2714
2715 my $desc = _item_to_desc ($item);
2716
2717 my $self = $class->SUPER::new ( 2764 my $self = $class->SUPER::new (
2718 can_hover => 1,
2719 can_events => 1,
2720 tooltip => ((CFClient::UI::Label::escape $desc)
2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2722 connect_button_down => sub {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2734 } elsif ($ev->{button} == 1) {
2735 $::CONN->send ("examine $item->{tag}");
2736 } elsif ($ev->{button} == 2) {
2737 $::CONN->send ("apply $item->{tag}");
2738 } elsif ($ev->{button} == 3) {
2739 my @menu_items = (
2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2752 ),
2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2756 }
2757
2758 1
2759 },
2760 %args
2761 );
2762
2763
2764 $self->add (new CFClient::UI::Face
2765 can_events => 0,
2766 face => $item->{face},
2767 anim => $item->{anim},
2768 animspeed => $item->{animspeed},
2769 );
2770
2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2772
2773 $self->{item} = $item;
2774
2775 $self->update_item;
2776
2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2786}
2787
2788#############################################################################
2789
2790package CFClient::UI::Inventory;
2791
2792our @ISA = CFClient::UI::ScrolledWindow::;
2793
2794sub new {
2795 my $class = shift;
2796
2797 my $self = $class->SUPER::new (
2798 scrolled => (new CFClient::UI::Table), 2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2799 @_, 2766 @_,
2800 ); 2767 );
2801 2768
2802 $self 2769 $self
2803} 2770}
… …
2813 or ($a->{name} cmp $b->{name}) 2780 or ($a->{name} cmp $b->{name})
2814 } @$items; 2781 } @$items;
2815 2782
2816 $self->{real_items} = \@items; 2783 $self->{real_items} = \@items;
2817 2784
2785 my $row = 0;
2818 for my $item (@items) { 2786 for my $item (@items) {
2819 $item->{item} = $item; 2787 CFClient::Item::update_widgets $item;
2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823 2788
2824 my $i = 0; 2789 $self->{scrolled}->add (0, $row, $item->{face_widget});
2825 for (@items) { 2790 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2826 $self->{scrolled}->add (0, $i, $_); 2791 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2830 2792
2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2793 $row++;
2794 }
2832} 2795}
2833 2796
2834sub size_request { 2797sub size_request {
2835 my ($self) = @_; 2798 my ($self) = @_;
2836 ($self->{req_w}, $self->{req_h}); 2799 ($self->{req_w}, $self->{req_h});
… …
2876 2839
2877# 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)
2878sub popup { 2841sub popup {
2879 my ($self, $ev) = @_; 2842 my ($self, $ev) = @_;
2880 2843
2881 $self->emit ("popdown"); 2844 $self->_emit ("popdown");
2882 2845
2883 # maybe save $GRAB? must be careful about events... 2846 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2847 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2848 $self->{button} = $ev->{button};
2886 2849
… …
2901 2864
2902 if ($ev->{button} == $self->{button}) { 2865 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2866 undef $GRAB;
2904 $self->hide; 2867 $self->hide;
2905 2868
2906 $self->emit ("popdown"); 2869 $self->_emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover}; 2870 $self->{hover}[1]->() if $self->{hover};
2908 } 2871 }
2909} 2872}
2910 2873
2911############################################################################# 2874#############################################################################
… …
2973sub add { 2936sub add {
2974 my ($self, $text, %arg) = @_; 2937 my ($self, $text, %arg) = @_;
2975 2938
2976 $text =~ s/^\s+//; 2939 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 2940 $text =~ s/\s+$//;
2941
2942 return unless $text;
2978 2943
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 2944 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 2945
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2946 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 2947
… …
3026 2991
3027sub new { 2992sub new {
3028 my $class = shift; 2993 my $class = shift;
3029 2994
3030 $class->SUPER::new ( 2995 $class->SUPER::new (
2996 visible => 1,
3031 @_, 2997 @_,
3032 ) 2998 )
3033} 2999}
3034 3000
3035sub configure { 3001sub configure {
… …
3053} 3019}
3054 3020
3055sub size_allocate { 3021sub size_allocate {
3056 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h) = @_;
3057 3023
3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3060
3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3062 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3063
3064 for my $child ($self->children) { 3024 for my $child ($self->children) {
3065 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)};
3066 3026
3067 $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
3068 if exists $child->{req_x}; 3028 if exists $child->{req_x};
… …
3099sub add { 3059sub add {
3100 my ($self, @children) = @_; 3060 my ($self, @children) = @_;
3101 3061
3102 for (my @widgets = @children; my $w = pop @widgets; ) { 3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children; 3063 push @widgets, $w->children;
3104 $w->{root} = $self; 3064 $w->{root} = $self;
3105 $w->{visible} = 1; 3065 $w->{visible} = $self->{visible} + 1;
3106 } 3066 }
3107 3067
3108 for my $child (@children) { 3068 for my $child (@children) {
3109 $child->{toplevel} = 1; 3069 $child->{is_toplevel} = 1;
3110 3070
3111 # integerise window positions 3071 # integerise window positions
3112 $child->{x} = int $child->{x}; 3072 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y}; 3073 $child->{y} = int $child->{y};
3114 } 3074 }
… …
3122 $self->SUPER::remove (@children); 3082 $self->SUPER::remove (@children);
3123 3083
3124 while (@children) { 3084 while (@children) {
3125 my $w = pop @children; 3085 my $w = pop @children;
3126 push @children, $w->children; 3086 push @children, $w->children;
3127 delete $w->{visible}; 3087 $w->set_invisible;
3128 } 3088 }
3129} 3089}
3130 3090
3131sub on_refresh { 3091sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3092 my ($self, $id, $cb) = @_;
… …
3186 $w = 0 if $w < 0; 3146 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3147 $h = 0 if $h < 0;
3188 3148
3189 $widget->{w} = $w; 3149 $widget->{w} = $w;
3190 $widget->{h} = $h; 3150 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h);
3192 $widget->emit (size_allocate => $w, $h); 3151 $widget->emit (size_allocate => $w, $h);
3193 } 3152 }
3194 } 3153 }
3195 3154
3196 while ($self->{post_alloc_hook}) { 3155 while ($self->{post_alloc_hook}) {

Diff Legend

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