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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.233 by root, Thu May 25 03:42:40 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
149# call when resolution changes etc. 151# call when resolution changes etc.
150sub rescale_widgets { 152sub rescale_widgets {
151 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
152 154
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $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}; 158 $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}; 159 $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}; 160 $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}; 161 $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}; 162 $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}; 163 $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}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 165 }
167
168 $widget->reconfigure;
169 } 166 }
167
168 reconfigure_widgets;
170} 169}
171 170
172############################################################################# 171#############################################################################
173 172
174package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 224 },
226 ); 225 );
227} 226}
228 227
229sub hide { 228sub set_invisible {
230 my ($self) = @_; 229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
231 234
232 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
234 248
235 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
236 if $self->{parent}; 250 if $self->{parent};
237} 251}
238 252
… …
338 return if $FOCUS == $self; 352 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
340 354
341 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
342 356
343 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
344 358
345 $focus->update if $focus; 359 $focus->update if $focus;
346 $FOCUS->update; 360 $FOCUS->update;
347} 361}
348 362
… …
351 365
352 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
353 367
354 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
355 369
356 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
357 371
358 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
359} 376}
360 377
361sub mouse_motion { } 378sub mouse_motion { }
362sub button_up { } 379sub button_up { }
363sub key_down { } 380sub key_down { }
364sub key_up { } 381sub key_up { }
365 382
366sub button_down { 383sub button_down {
367 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
368 385
369 $self->focus_in; 386 $self->focus_in;
… …
463 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
464 481
465 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 483}
467 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
468sub emit { 491sub emit {
469 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
470 493
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
472} 496}
473 497
474sub DESTROY { 498sub DESTROY {
475 my ($self) = @_; 499 my ($self) = @_;
476 500
… …
816 840
817 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
818 vertical => 1, 842 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 844 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
822 }, 846 },
823 ; 847 ;
824 848
825 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 850 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 856 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
834 858
835 $self 859 $self
860}
861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 869}
837 870
838#TODO# update range on size_allocate depending on child 871#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 872# update viewport offset on scroll
840 873
… …
894 my $class = shift; 927 my $class = shift;
895 928
896 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
897 930
898 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
901 border => 0.6, 934 border => 0.6,
902 toplevel => 1, 935 is_toplevel => 1,
903 can_events => 1, 936 can_events => 1,
904 @_ 937 @_
905 ); 938 );
906 939
907 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 941 align => 0,
… …
1510 $self->{text} = $text; 1543 $self->{text} = $text;
1511 1544
1512 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1514 1547
1515 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1516} 1549}
1517 1550
1518sub set_text { 1551sub set_text {
1519 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1520 1553
… …
1532 my ($self) = @_; 1565 my ($self) = @_;
1533 1566
1534 my ($w, $h) = $self->SUPER::size_request; 1567 my ($w, $h) = $self->SUPER::size_request;
1535 1568
1536 ($w + 1, $h) # add 1 for cursor 1569 ($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} 1570}
1544 1571
1545sub key_down { 1572sub key_down {
1546 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1547 1574
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1593 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1594 $self->_emit ('escape');
1568 } elsif ($uni) { 1595 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1597 }
1571 1598
1572 $self->_set_text ($text); 1599 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1686 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1665 $self->update; 1692 $self->update;
1666 1693
1667 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1744 can_events => 1,
1718 @_ 1745 @_
1719 ) 1746 )
1720} 1747}
1721 1748
1749sub activate { }
1750
1722sub button_up { 1751sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1724 1753
1754 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1757}
1730 1758
1731sub _draw { 1759sub _draw {
1732 my ($self) = @_; 1760 my ($self) = @_;
1733 1761
… …
1785 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1786 1814
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1791 } 1819 }
1792} 1820}
1793 1821
1794sub _draw { 1822sub _draw {
1795 my ($self) = @_; 1823 my ($self) = @_;
… …
2111 if $unit; 2139 if $unit;
2112 2140
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2142
2115 if ($value != $old_value) { 2143 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2144 $self->_emit (changed => $value);
2117 $self->update; 2145 $self->update;
2118 } 2146 }
2119} 2147}
2120 2148
2121sub size_request { 2149sub size_request {
… …
2503 2531
2504 # TODO: use animation 2532 # TODO: use animation
2505 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open"); 2536 $self->_emit ("open");
2509 } else { 2537 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close"); 2539 $self->_emit ("close");
2512 } 2540 }
2513 2541
2514 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2515} 2543}
2516 2544
2517############################################################################# 2545#############################################################################
2518 2546
2519package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2867 2895
2868# popup given the event (must be a mouse button down event currently) 2896# popup given the event (must be a mouse button down event currently)
2869sub popup { 2897sub popup {
2870 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2871 2899
2872 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2873 2901
2874 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2903 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2877 2905
… …
2892 2920
2893 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2922 undef $GRAB;
2895 $self->hide; 2923 $self->hide;
2896 2924
2897 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2899 } 2927 }
2900} 2928}
2901 2929
2902############################################################################# 2930#############################################################################
… …
2964sub add { 2992sub add {
2965 my ($self, $text, %arg) = @_; 2993 my ($self, $text, %arg) = @_;
2966 2994
2967 $text =~ s/^\s+//; 2995 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 2996 $text =~ s/\s+$//;
2997
2998 return unless $text;
2969 2999
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3000 my $timeout = time + ((delete $arg{timeout}) || 60);
2971 3001
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3002 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3003
… …
3044} 3074}
3045 3075
3046sub size_allocate { 3076sub size_allocate {
3047 my ($self, $w, $h) = @_; 3077 my ($self, $w, $h) = @_;
3048 3078
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055 for my $child ($self->children) { 3079 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3080 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3081
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3082 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059 if exists $child->{req_x}; 3083 if exists $child->{req_x};
… …
3088} 3112}
3089 3113
3090sub add { 3114sub add {
3091 my ($self, @children) = @_; 3115 my ($self, @children) = @_;
3092 3116
3117 for (my @widgets = @children; my $w = pop @widgets; ) {
3118 push @widgets, $w->children;
3119 $w->{root} = $self;
3120 $w->{visible} = 1;
3121 }
3122
3093 for my $child (@children) { 3123 for my $child (@children) {
3094 $child->{toplevel} = 1; 3124 $child->{is_toplevel} = 1;
3095 3125
3096 # integerise window positions 3126 # integerise window positions
3097 $child->{x} = int $child->{x}; 3127 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y}; 3128 $child->{y} = int $child->{y};
3099 } 3129 }
3100 3130
3101 $self->SUPER::add (@children); 3131 $self->SUPER::add (@children);
3132}
3133
3134sub remove {
3135 my ($self, @children) = @_;
3136
3137 $self->SUPER::remove (@children);
3102 3138
3103 while (@children) { 3139 while (@children) {
3104 my $w = pop @children; 3140 my $w = pop @children;
3105 push @children, $w->children; 3141 push @children, $w->children;
3106 $w->{visible} = 1; 3142 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3143 }
3120} 3144}
3121 3145
3122sub on_refresh { 3146sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3147 my ($self, $id, $cb) = @_;
… …
3177 $w = 0 if $w < 0; 3201 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3202 $h = 0 if $h < 0;
3179 3203
3180 $widget->{w} = $w; 3204 $widget->{w} = $w;
3181 $widget->{h} = $h; 3205 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h);
3183 $widget->emit (size_allocate => $w, $h); 3206 $widget->emit (size_allocate => $w, $h);
3184 } 3207 }
3185 } 3208 }
3186 3209
3187 while ($self->{post_alloc_hook}) { 3210 while ($self->{post_alloc_hook}) {

Diff Legend

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