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.227 by root, Wed May 24 03:29:20 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
50 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
51} 52}
52 53
53# class methods for events 54# class methods for events
54sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 57 if $FOCUS;
57} 58}
58 59
59sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 62 if $FOCUS;
62} 63}
63 64
64sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
65 my ($ev) = @_; 66 my ($ev) = @_;
… …
74 check_tooltip; 75 check_tooltip;
75 } 76 }
76 77
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 79
79 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 82}
84 83
85sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
86 my ($ev) = @_; 85 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
88 87
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 89
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 91
93 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 94
98 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 97 $grab->update if $grab;
101 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 115
119 check_tooltip; 116 check_tooltip;
120 } 117 }
121 118
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 120 if $HOVER;
126} 121}
127 122
128# convert position array to integers 123# convert position array to integers
129sub harmonize { 124sub harmonize {
130 my ($vals) = @_; 125 my ($vals) = @_;
… …
144 139
145 $_->update 140 $_->update
146 for @widgets; 141 for @widgets;
147} 142}
148 143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
149# call when resolution changes etc. 152# call when resolution changes etc.
150sub rescale_widgets { 153sub rescale_widgets {
151 my ($sx, $sy) = @_; 154 my ($sx, $sy) = @_;
152 155
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 156 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 166 }
167
168 $widget->reconfigure;
169 } 167 }
168
169 reconfigure_widgets;
170} 170}
171 171
172############################################################################# 172#############################################################################
173 173
174package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 225 },
226 ); 226 );
227} 227}
228 228
229sub hide { 229sub set_invisible {
230 my ($self) = @_; 230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{visible};
231 235
232 undef $GRAB if $GRAB == $self; 236 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 237 undef $HOVER if $HOVER == $self;
238
239 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self;
241
242 $self->focus_out;
243}
244
245sub hide {
246 my ($self) = @_;
247
248 $self->set_invisible;
234 249
235 $self->{parent}->remove ($self) 250 $self->{parent}->remove ($self)
236 if $self->{parent}; 251 if $self->{parent};
237} 252}
238 253
… …
308} 323}
309 324
310sub set_tooltip { 325sub set_tooltip {
311 my ($self, $tooltip) = @_; 326 my ($self, $tooltip) = @_;
312 327
328 $tooltip =~ s/^\s+//;
329 $tooltip =~ s/\s+$//;
330
331 return if $self->{tooltip} eq $tooltip;
332
313 $self->{tooltip} = $tooltip; 333 $self->{tooltip} = $tooltip;
314 334
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 335 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 336 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 337 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 358 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 359 return unless $self->{can_focus};
340 360
341 my $focus = $FOCUS; $FOCUS = $self; 361 my $focus = $FOCUS; $FOCUS = $self;
342 362
343 $self->emit (focus_in => $focus); 363 $self->_emit (focus_in => $focus);
344 364
345 $focus->update if $focus; 365 $focus->update if $focus;
346 $FOCUS->update; 366 $FOCUS->update;
347} 367}
348 368
… …
351 371
352 return unless $FOCUS == $self; 372 return unless $FOCUS == $self;
353 373
354 my $focus = $FOCUS; undef $FOCUS; 374 my $focus = $FOCUS; undef $FOCUS;
355 375
356 $self->emit (focus_out => $focus); 376 $self->_emit (focus_out => $focus);
357 377
358 $focus->update if $focus; #? 378 $focus->update if $focus; #?
379
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS;
359} 382}
360 383
361sub mouse_motion { } 384sub mouse_motion { }
362sub button_up { } 385sub button_up { }
363sub key_down { } 386sub key_down { }
364sub key_up { } 387sub key_up { }
365 388
366sub button_down { 389sub button_down {
367 my ($self, $ev, $x, $y) = @_; 390 my ($self, $ev, $x, $y) = @_;
368 391
369 $self->focus_in; 392 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 426 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 427 glPushMatrix;
405 glColor 1, 1, 0, 1; 428 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 430 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 431 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 432 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 433 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 434 glVertex 0 , $self->{h} - 1;
412 glEnd; 435 glEnd;
413 glPopMatrix; 436 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 438 }
416} 439}
… …
436sub set_parent { 459sub set_parent {
437 my ($self, $parent) = @_; 460 my ($self, $parent) = @_;
438 461
439 Scalar::Util::weaken ($self->{parent} = $parent); 462 Scalar::Util::weaken ($self->{parent} = $parent);
440 463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
441 # TODO: req_w _does_change after ->reconfigure 467 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 468 $self->check_size
443 unless exists $self->{req_w}; 469 unless exists $self->{req_w};
444 470
445 $self->show; 471 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 489 my ($self, $signal, $cb) = @_;
464 490
465 push @{ $self->{signal_cb}{$signal} }, $cb; 491 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 492}
467 493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
468sub emit { 500sub emit {
469 my ($self, $signal, @args) = @_; 501 my ($self, $signal, @args) = @_;
470 502
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
472} 505}
473 506
474sub DESTROY { 507sub DESTROY {
475 my ($self) = @_; 508 my ($self) = @_;
476 509
… …
589 delete $child->{parent}; 622 delete $child->{parent};
590 $child->hide; 623 $child->hide;
591 624
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 626
594 $self->check_size; 627 $self->check_size (1);
595 $self->update; 628 $self->update;
596} 629}
597 630
598sub clear { 631sub clear {
599 my ($self) = @_; 632 my ($self) = @_;
… …
739 772
740package CFClient::UI::ViewPort; 773package CFClient::UI::ViewPort;
741 774
742our @ISA = CFClient::UI::Window::; 775our @ISA = CFClient::UI::Window::;
743 776
777sub new {
778 my $class = shift;
779
780 $class->SUPER::new (
781 scroll_x => 0,
782 scroll_y => 1,
783 @_,
784 )
785}
786
744sub size_request { 787sub size_request {
745 my ($self) = @_; 788 my ($self) = @_;
746 789
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 791
… …
750} 793}
751 794
752sub size_allocate { 795sub size_allocate {
753 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
754 797
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800
757 $self->child->configure (0, 0, $cw, $ch); 801 $self->child->configure (0, 0, $w, $h);
758 $self->update; 802 $self->update;
759} 803}
760 804
761sub set_offset { 805sub set_offset {
762 my ($self, $x, $y) = @_; 806 my ($self, $x, $y) = @_;
… …
816 860
817 my $slider = new CFClient::UI::Slider 861 my $slider = new CFClient::UI::Slider
818 vertical => 1, 862 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 863 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 864 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 865 $self->{vp}->set_offset (0, $_[1]);
822 }, 866 },
823 ; 867 ;
824 868
825 $self = $class->SUPER::new ( 869 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 870 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 875 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 876 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 877 $self->add ($self->{slider});
834 878
835 $self 879 $self
880}
881
882sub update {
883 my ($self) = @_;
884
885 $self->SUPER::update;
886
887 # todo: overwrite size_allocate of child
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890}
891
892sub size_allocate {
893 my ($self, $w, $h) = @_;
894
895 $self->SUPER::size_allocate ($w, $h);
896
897 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 899}
837 900
838#TODO# update range on size_allocate depending on child 901#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 902# update viewport offset on scroll
840 903
… …
894 my $class = shift; 957 my $class = shift;
895 958
896 # TODO: user_x, user_y, overwrite moveto? 959 # TODO: user_x, user_y, overwrite moveto?
897 960
898 my $self = $class->SUPER::new ( 961 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 962 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 963 border_bg => [1, 1, 1, 1],
901 border => 0.6, 964 border => 0.6,
902 toplevel => 1, 965 is_toplevel => 1,
903 can_events => 1, 966 can_events => 1,
904 @_ 967 @_
905 ); 968 );
906 969
907 $self->{title} &&= new CFClient::UI::Label 970 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 971 align => 0,
… …
1048sub new { 1111sub new {
1049 my $class = shift; 1112 my $class = shift;
1050 1113
1051 $class->SUPER::new ( 1114 $class->SUPER::new (
1052 col_expand => [], 1115 col_expand => [],
1053 @_ 1116 @_,
1054 ) 1117 )
1118}
1119
1120sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1122}
1056 1123
1057sub add { 1124sub add {
1058 my ($self, $x, $y, $child) = @_; 1125 my ($self, $x, $y, $child) = @_;
1059 1126
1060 $child->set_parent ($self); 1127 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1128 $self->{children}[$y][$x] = $child;
1062 1129
1063 $child->check_size; 1130 $self->check_size (1);
1064} 1131}
1065 1132
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1133# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1134sub clear {
1072 my ($self) = @_; 1135 my ($self) = @_;
1073 1136
1074 my @children = $self->children; 1137 my @children = $self->children;
1075 delete $self->{children}; 1138 delete $self->{children};
… …
1077 for (@children) { 1140 for (@children) {
1078 delete $_->{parent}; 1141 delete $_->{parent};
1079 $_->hide; 1142 $_->hide;
1080 } 1143 }
1081 1144
1145 $self->check_size (1);
1082 $self->update; 1146 $self->update;
1083} 1147}
1084 1148
1085sub get_wh { 1149sub get_wh {
1086 my ($self) = @_; 1150 my ($self) = @_;
… …
1118sub size_allocate { 1182sub size_allocate {
1119 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1120 1184
1121 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1122 1186
1123 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1125 1189
1126 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1574 $self->{text} = $text;
1511 1575
1512 $text =~ s/./*/g if $self->{hidden}; 1576 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1577 $self->{layout}->set_text ("$text ");
1514 1578
1515 $self->emit (changed => $self->{text}); 1579 $self->_emit (changed => $self->{text});
1516} 1580}
1517 1581
1518sub set_text { 1582sub set_text {
1519 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1520 1584
… …
1532 my ($self) = @_; 1596 my ($self) = @_;
1533 1597
1534 my ($w, $h) = $self->SUPER::size_request; 1598 my ($w, $h) = $self->SUPER::size_request;
1535 1599
1536 ($w + 1, $h) # add 1 for cursor 1600 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1601}
1544 1602
1545sub key_down { 1603sub key_down {
1546 my ($self, $ev) = @_; 1604 my ($self, $ev) = @_;
1547 1605
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1620 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1621 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1622 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1623 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1624 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1625 $self->_emit ('escape');
1568 } elsif ($uni) { 1626 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1627 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1628 }
1571 1629
1572 $self->_set_text ($text); 1630 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1717 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1718 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1719 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1720 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1721 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1722 $self->_emit (activate => $txt);
1665 $self->update; 1723 $self->update;
1666 1724
1667 } elsif ($sym == CFClient::SDLK_UP) { 1725 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1726 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1727 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1775 can_events => 1,
1718 @_ 1776 @_
1719 ) 1777 )
1720} 1778}
1721 1779
1780sub activate { }
1781
1722sub button_up { 1782sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1783 my ($self, $ev, $x, $y) = @_;
1724 1784
1785 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1786 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1787 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1788}
1730 1789
1731sub _draw { 1790sub _draw {
1732 my ($self) = @_; 1791 my ($self) = @_;
1733 1792
… …
1785 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1786 1845
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1848 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1849 $self->_emit (changed => $self->{state});
1791 } 1850 }
1792} 1851}
1793 1852
1794sub _draw { 1853sub _draw {
1795 my ($self) = @_; 1854 my ($self) = @_;
… …
2088} 2147}
2089 2148
2090sub set_range { 2149sub set_range {
2091 my ($self, $range) = @_; 2150 my ($self, $range) = @_;
2092 2151
2093 $self->{range} = $range; 2152 ($range, $self->{range}) = ($self->{range}, $range);
2094 2153
2095 $self->update; 2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2096} 2156}
2097 2157
2098sub set_value { 2158sub set_value {
2099 my ($self, $value) = @_; 2159 my ($self, $value) = @_;
2100 2160
… …
2111 if $unit; 2171 if $unit;
2112 2172
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2174
2115 if ($value != $old_value) { 2175 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2176 $self->_emit (changed => $value);
2117 $self->update; 2177 $self->update;
2118 } 2178 }
2119} 2179}
2120 2180
2121sub size_request { 2181sub size_request {
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2353 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2354
2295 $self->reflow; 2355 $self->reflow;
2296} 2356}
2297 2357
2298sub text_height { 2358sub text_size {
2299 my ($self, $text, $indent) = @_; 2359 my ($self, $text, $indent) = @_;
2300 2360
2301 my $layout = $self->{layout}; 2361 my $layout = $self->{layout};
2302 2362
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2364 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2365 $layout->set_markup ($text);
2306 2366
2307 ($layout->size)[1] 2367 $layout->size
2308} 2368}
2309 2369
2310sub reflow { 2370sub reflow {
2311 my ($self) = @_; 2371 my ($self) = @_;
2312 2372
… …
2331 2391
2332sub add_paragraph { 2392sub add_paragraph {
2333 my ($self, $color, $text, $indent) = @_; 2393 my ($self, $color, $text, $indent) = @_;
2334 2394
2335 for my $line (split /\n/, $text) { 2395 for my $line (split /\n/, $text) {
2336 my $height = $self->text_height ($line); 2396 my ($w, $h) = $self->text_size ($line);
2337 $self->{height} += $height; 2397 $self->{height} += $h;
2338 push @{$self->{par}}, [$height, $color, $indent, $line]; 2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 } 2399 }
2340 2400
2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2401 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2342} 2402}
2343 2403
… …
2349 return unless $self->{h} > 0; 2409 return unless $self->{h} > 0;
2350 2410
2351 delete $self->{texture}; 2411 delete $self->{texture};
2352 2412
2353 $ROOT->on_post_alloc ($self, sub { 2413 $ROOT->on_post_alloc ($self, sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415
2354 if (delete $self->{need_reflow}) { 2416 if (delete $self->{need_reflow}) {
2355 my $height = 0; 2417 my $height = 0;
2356 2418
2357 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2419 my $layout = $self->{layout};
2420
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422
2358 for @{$self->{par}}; 2423 for (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2425 $layout->set_width ($W - $_->[3]);
2426 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3];
2429 $_->[1] = $h;
2430 }
2431
2432 $height += $_->[1];
2433 }
2359 2434
2360 $self->{height} = $height; 2435 $self->{height} = $height;
2361 2436
2362 $self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]); 2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2363 2438
2364 delete $self->{texture}; 2439 delete $self->{texture};
2365 } 2440 }
2366 2441
2367 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2368 glClearColor 0.5, 0.5, 0.5, 0; 2443 glClearColor 0.5, 0.5, 0.5, 0;
2369 glClear GL_COLOR_BUFFER_BIT; 2444 glClear GL_COLOR_BUFFER_BIT;
2370 2445
2371 my $top = int $self->{children}[1]{range}[0]; 2446 my $top = int $self->{children}[1]{range}[0];
2372 2447
2373 my $y0 = $top; 2448 my $y0 = $top;
2374 my $y1 = $top + $self->{h}; 2449 my $y1 = $top + $H;
2375 2450
2376 my $y = 0; 2451 my $y = 0;
2377 2452
2378 my $layout = $self->{layout}; 2453 my $layout = $self->{layout};
2379 2454
2380 $layout->set_font ($self->{font}) if $self->{font}; 2455 $layout->set_font ($self->{font}) if $self->{font};
2381 2456
2382 glEnable GL_BLEND; 2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
2383 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2384 2460
2385 for my $par (@{$self->{par}}) { 2461 for my $par (@{$self->{par}}) {
2386 my $h = $par->[0]; 2462 my $h = $par->[1];
2387 2463
2388 if ($y0 < $y + $h && $y < $y1) { 2464 if ($y0 < $y + $h && $y < $y1) {
2389 $layout->set_foreground (@{ $par->[1] }); 2465 $layout->set_foreground (@{ $par->[2] });
2390 $layout->set_width ($self->{w} - $par->[2]); 2466 $layout->set_width ($W - $par->[3]);
2391 $layout->set_markup ($par->[3]); 2467 $layout->set_markup ($par->[4]);
2392 2468
2393 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2469 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2394 2470
2395 glRasterPos $par->[2], $y - $y0; 2471 glRasterPos $par->[3], $y - $y0;
2396 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2472 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2397 } 2473 }
2398 2474
2399 $y += $h; 2475 $y += $h;
2400 } 2476 }
… …
2487 2563
2488 # TODO: use animation 2564 # TODO: use animation
2489 if ($self->{state} = !$self->{state}) { 2565 if ($self->{state} = !$self->{state}) {
2490 $CFClient::UI::ROOT->add ($self->{other}); 2566 $CFClient::UI::ROOT->add ($self->{other});
2491 $self->{other}->move ($self->coord2global (0, $self->{h})); 2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2492 $self->emit ("open"); 2568 $self->_emit ("open");
2493 } else { 2569 } else {
2494 $CFClient::UI::ROOT->remove ($self->{other}); 2570 $CFClient::UI::ROOT->remove ($self->{other});
2495 $self->emit ("close"); 2571 $self->_emit ("close");
2496 } 2572 }
2497 2573
2498 $self->emit (changed => $self->{state}); 2574 $self->_emit (changed => $self->{state});
2499} 2575}
2500 2576
2501############################################################################# 2577#############################################################################
2502 2578
2503package CFClient::UI::Tooltip; 2579package CFClient::UI::Tooltip;
… …
2579 2655
2580sub new { 2656sub new {
2581 my $class = shift; 2657 my $class = shift;
2582 2658
2583 my $self = $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2584 aspect => 1, 2660 aspect => 1,
2661 can_events => 0,
2585 @_, 2662 @_,
2586 ); 2663 );
2587 2664
2588 if ($self->{anim} && $self->{animspeed}) { 2665 if ($self->{anim} && $self->{animspeed}) {
2589 Scalar::Util::weaken (my $widget = $self); 2666 Scalar::Util::weaken (my $widget = $self);
… …
2648 $self->SUPER::DESTROY; 2725 $self->SUPER::DESTROY;
2649} 2726}
2650 2727
2651############################################################################# 2728#############################################################################
2652 2729
2653package CFClient::UI::InventoryItem; 2730package CFClient::UI::Inventory;
2654 2731
2655our @ISA = CFClient::UI::HBox::; 2732our @ISA = CFClient::UI::ScrolledWindow::;
2656
2657sub _item_to_desc {
2658 my ($item) = @_;
2659
2660 my $desc =
2661 $item->{nrof} < 2
2662 ? $item->{name}
2663 : "$item->{nrof} × $item->{name_pl}";
2664
2665 $item->{flags} & Crossfire::Protocol::F_OPEN
2666 and $desc .= " (open)";
2667 $item->{flags} & Crossfire::Protocol::F_APPLIED
2668 and $desc .= " (applied)";
2669 $item->{flags} & Crossfire::Protocol::F_UNPAID
2670 and $desc .= " (unpaid)";
2671 $item->{flags} & Crossfire::Protocol::F_MAGIC
2672 and $desc .= " (magic)";
2673 $item->{flags} & Crossfire::Protocol::F_CURSED
2674 and $desc .= " (cursed)";
2675 $item->{flags} & Crossfire::Protocol::F_DAMNED
2676 and $desc .= " (damned)";
2677 $item->{flags} & Crossfire::Protocol::F_LOCKED
2678 and $desc .= " *";
2679
2680 $desc
2681}
2682 2733
2683sub new { 2734sub new {
2684 my $class = shift; 2735 my $class = shift;
2685 2736
2686 my %args = @_;
2687
2688 my $item = delete $args{item};
2689
2690 my $desc = _item_to_desc ($item);
2691
2692 my $self = $class->SUPER::new ( 2737 my $self = $class->SUPER::new (
2693 can_hover => 1,
2694 can_events => 1,
2695 tooltip => ((CFClient::UI::Label::escape $desc)
2696 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2697 connect_button_down => sub {
2698 my ($self, $ev, $x, $y) = @_;
2699
2700 # todo: maybe put examine on 1? but should just be a tooltip :(
2701 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2702 my $targ = $::CONN->{player}{tag};
2703
2704 if ($item->{container} == $::CONN->{player}{tag}) {
2705 $targ = $main::OPENCONT;
2706 }
2707
2708 $::CONN->send ("move $targ $item->{tag} 0");
2709 } elsif ($ev->{button} == 1) {
2710 $::CONN->send ("examine $item->{tag}");
2711 } elsif ($ev->{button} == 2) {
2712 $::CONN->send ("apply $item->{tag}");
2713 } elsif ($ev->{button} == 3) {
2714 my @menu_items = (
2715 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2716 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2717 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2718 (
2719 $item->{flags} & Crossfire::Protocol::F_LOCKED
2720 ? (
2721 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2722 )
2723 : (
2724 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2725 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2726 )
2727 ),
2728 );
2729
2730 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2731 }
2732
2733 1
2734 },
2735 %args
2736 );
2737
2738
2739 $self->add (new CFClient::UI::Face
2740 can_events => 0,
2741 face => $item->{face},
2742 anim => $item->{anim},
2743 animspeed => $item->{animspeed},
2744 );
2745
2746 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2747
2748 $self->{item} = $item;
2749
2750 $self->update_item;
2751
2752 $self
2753}
2754
2755sub update_item {
2756 my ($self) = @_;
2757
2758 my $desc = _item_to_desc ($self->{item});
2759
2760 $self->{name_lbl}->set_text ($desc);
2761}
2762
2763#############################################################################
2764
2765package CFClient::UI::Inventory;
2766
2767our @ISA = CFClient::UI::ScrolledWindow::;
2768
2769sub new {
2770 my $class = shift;
2771
2772 my $self = $class->SUPER::new (
2773 scrolled => (new CFClient::UI::Table), 2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2774 @_, 2739 @_,
2775 ); 2740 );
2776 2741
2777 $self 2742 $self
2778} 2743}
… …
2788 or ($a->{name} cmp $b->{name}) 2753 or ($a->{name} cmp $b->{name})
2789 } @$items; 2754 } @$items;
2790 2755
2791 $self->{real_items} = \@items; 2756 $self->{real_items} = \@items;
2792 2757
2758 my $row = 0;
2793 for my $item (@items) { 2759 for my $item (@items) {
2794 $item->{item} = $item; 2760 CFClient::Item::update_widgets $item;
2795 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2796 $item->update_item ();
2797 }
2798 2761
2799 my $i = 0; 2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2800 for (@items) { 2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2801 $self->{scrolled}->add (0, $i, $_); 2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2802 my $nrof = $_->{item}->{nrof} || 1;
2803 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2804 }
2805 2765
2806# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2766 $row++;
2767 }
2807} 2768}
2808 2769
2809sub size_request { 2770sub size_request {
2810 my ($self) = @_; 2771 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h}); 2772 ($self->{req_w}, $self->{req_h});
… …
2851 2812
2852# popup given the event (must be a mouse button down event currently) 2813# popup given the event (must be a mouse button down event currently)
2853sub popup { 2814sub popup {
2854 my ($self, $ev) = @_; 2815 my ($self, $ev) = @_;
2855 2816
2856 $self->emit ("popdown"); 2817 $self->_emit ("popdown");
2857 2818
2858 # maybe save $GRAB? must be careful about events... 2819 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2820 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2821 $self->{button} = $ev->{button};
2861 2822
… …
2876 2837
2877 if ($ev->{button} == $self->{button}) { 2838 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 2839 undef $GRAB;
2879 $self->hide; 2840 $self->hide;
2880 2841
2881 $self->emit ("popdown"); 2842 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2843 $self->{hover}[1]->() if $self->{hover};
2883 } 2844 }
2884} 2845}
2885 2846
2886############################################################################# 2847#############################################################################
… …
2948sub add { 2909sub add {
2949 my ($self, $text, %arg) = @_; 2910 my ($self, $text, %arg) = @_;
2950 2911
2951 $text =~ s/^\s+//; 2912 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 2913 $text =~ s/\s+$//;
2914
2915 return unless $text;
2953 2916
2954 my $timeout = time + ((delete $arg{timeout}) || 60); 2917 my $timeout = time + ((delete $arg{timeout}) || 60);
2955 2918
2956 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2957 2920
… …
3028} 2991}
3029 2992
3030sub size_allocate { 2993sub size_allocate {
3031 my ($self, $w, $h) = @_; 2994 my ($self, $w, $h) = @_;
3032 2995
3033 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3034 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3035
3036 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3037 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3038
3039 for my $child ($self->children) { 2996 for my $child ($self->children) {
3040 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3041 2998
3042 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3043 if exists $child->{req_x}; 3000 if exists $child->{req_x};
… …
3072} 3029}
3073 3030
3074sub add { 3031sub add {
3075 my ($self, @children) = @_; 3032 my ($self, @children) = @_;
3076 3033
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3077 for my $child (@children) { 3040 for my $child (@children) {
3078 $child->{toplevel} = 1; 3041 $child->{is_toplevel} = 1;
3079 3042
3080 # integerise window positions 3043 # integerise window positions
3081 $child->{x} = int $child->{x}; 3044 $child->{x} = int $child->{x};
3082 $child->{y} = int $child->{y}; 3045 $child->{y} = int $child->{y};
3083 } 3046 }
3084 3047
3085 $self->SUPER::add (@children); 3048 $self->SUPER::add (@children);
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3086 3055
3087 while (@children) { 3056 while (@children) {
3088 my $w = pop @children; 3057 my $w = pop @children;
3089 push @children, $w->children; 3058 push @children, $w->children;
3090 $w->{visible} = 1; 3059 $w->set_invisible;
3091 }
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 delete $w->{visible};
3103 } 3060 }
3104} 3061}
3105 3062
3106sub on_refresh { 3063sub on_refresh {
3107 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
… …
3161 $w = 0 if $w < 0; 3118 $w = 0 if $w < 0;
3162 $h = 0 if $h < 0; 3119 $h = 0 if $h < 0;
3163 3120
3164 $widget->{w} = $w; 3121 $widget->{w} = $w;
3165 $widget->{h} = $h; 3122 $widget->{h} = $h;
3166 $widget->size_allocate ($w, $h);
3167 $widget->emit (size_allocate => $w, $h); 3123 $widget->emit (size_allocate => $w, $h);
3168 } 3124 }
3169 } 3125 }
3170 3126
3171 while ($self->{post_alloc_hook}) { 3127 while ($self->{post_alloc_hook}) {

Diff Legend

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