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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.172 by root, Tue Apr 25 09:52:04 2006 UTC

… …
39 delete $TOOLTIP->{owner}; 39 delete $TOOLTIP->{owner};
40} 40}
41 41
42# class methods for events 42# class methods for events
43sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
45} 46}
46 47
47sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
49} 51}
50 52
51sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
52 my ($ev) = @_; 54 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 63 check_tooltip;
62 } 64 }
63 65
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 67
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
67} 72}
68 73
69sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
70 my ($ev) = @_; 75 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
72 77
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 79
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 81
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
78 86
79 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 89 $grab->update if $grab;
82 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 107
100 check_tooltip; 108 check_tooltip;
101 } 109 }
102 110
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
104} 115}
105 116
106# convert position array to integers 117# convert position array to integers
107sub harmonize { 118sub harmonize {
108 my ($vals) = @_; 119 my ($vals) = @_;
… …
126 137
127sub new { 138sub new {
128 my $class = shift; 139 my $class = shift;
129 140
130 my $self = bless { 141 my $self = bless {
131 x => 0, 142 x => 0,
132 y => 0, 143 y => 0,
133 z => 0, 144 z => 0,
134 can_events => 1, 145 can_events => 1,
135 @_ 146 @_
136 }, $class; 147 }, $class;
137 148
138 for (keys %$self) { 149 for (keys %$self) {
… …
160} 171}
161 172
162sub hide { 173sub hide {
163 my ($self) = @_; 174 my ($self) = @_;
164 175
165 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
166 178
167 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
168} 181}
169 182
170sub move { 183sub move {
171 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
172 185
… …
223 236
224sub size_allocate { 237sub size_allocate {
225 # nothing to be done 238 # nothing to be done
226} 239}
227 240
241sub children {
242}
243
228sub set_max_size { 244sub set_max_size {
229 my ($self, $w, $h) = @_; 245 my ($self, $w, $h) = @_;
230 246
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 247 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 248 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 249}
234 250
235# return top left coordinates 251# return top left coordinates
236sub _topleft { 252sub _topleft {
237 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
238 257
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 259}
241 260
242# translate global coordinates to local coordinate system 261# translate global coordinates to local coordinate system
… …
402} 421}
403 422
404sub emit { 423sub emit {
405 my ($self, $signal, @args) = @_; 424 my ($self, $signal, @args) = @_;
406 425
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 427}
411 428
412sub DESTROY { 429sub DESTROY {
413 my ($self) = @_; 430 my ($self) = @_;
414 431
… …
481sub new { 498sub new {
482 my ($class, %arg) = @_; 499 my ($class, %arg) = @_;
483 500
484 my $children = delete $arg{children} || []; 501 my $children = delete $arg{children} || [];
485 502
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 503 my $self = $class->SUPER::new (
504 children => [],
505 can_events => 0,
506 %arg,
507 );
487 $self->add ($_) for @$children; 508 $self->add ($_) for @$children;
488 509
489 $self 510 $self
490} 511}
491 512
… …
502 ]; 523 ];
503 524
504 $child->check_size; 525 $child->check_size;
505} 526}
506 527
528sub children {
529 @{ $_[0]{children} }
530}
531
507sub remove { 532sub remove {
508 my ($self, $child) = @_; 533 my ($self, $child) = @_;
509 534
510 delete $child->{parent}; 535 delete $child->{parent};
536 $child->hide;
511 537
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 539
514 $self->check_size; 540 $self->check_size;
515 $self->update; 541 $self->update;
516} 542}
517 543
518sub clear { 544sub clear {
519 my ($self) = @_; 545 my ($self) = @_;
520 546
521 delete $_->{parent} 547 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 548 $self->{children} = [];
549
550 for (@$children) {
551 delete $_->{parent};
552 $_->hide;
553 }
525} 554}
526 555
527sub find_widget { 556sub find_widget {
528 my ($self, $x, $y) = @_; 557 my ($self, $x, $y) = @_;
529 558
… …
733 my $class = shift; 762 my $class = shift;
734 763
735 # TODO: user_x, user_y, overwrite moveto? 764 # TODO: user_x, user_y, overwrite moveto?
736 765
737 my $self = $class->SUPER::new ( 766 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 767 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 768 border_bg => [1, 1, 1, 1],
740 border => 0.8, 769 border => 0.8,
741 can_events => 1, 770 can_events => 1,
742 @_ 771 @_
743 ); 772 );
744 773
745 $self->{title} &&= new CFClient::UI::Label 774 $self->{title} &&= new CFClient::UI::Label
… …
893 $self->{children}[$y][$x] = $child; 922 $self->{children}[$y][$x] = $child;
894 923
895 $child->check_size; 924 $child->check_size;
896} 925}
897 926
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
898# TODO: move to container class maybe? send childs a signal on removal? 931# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 932sub clear {
900 my ($self) = @_; 933 my ($self) = @_;
901 934
935 my @children = $self->children;
902 delete $self->{children}; 936 delete $self->{children};
937
938 for (@children) {
939 delete $_->{parent};
940 $_->hide;
941 }
942
903 $self->update; 943 $self->update;
904} 944}
905 945
906sub get_wh { 946sub get_wh {
907 my ($self) = @_; 947 my ($self) = @_;
… …
1130 1170
1131sub new { 1171sub new {
1132 my ($class, %arg) = @_; 1172 my ($class, %arg) = @_;
1133 1173
1134 my $self = $class->SUPER::new ( 1174 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1175 fg => [1, 1, 1],
1136 #font => default_font 1176 #font => default_font
1137 fontsize => 1, 1177 fontsize => 1,
1138 text => "", 1178 text => "",
1139 align => -1, 1179 align => -1,
1140 valign => -1, 1180 valign => -1,
1141 padding => 2, 1181 padding => 2,
1142 layout => new CFClient::Layout, 1182 layout => new CFClient::Layout,
1143 can_events => 0, 1183 can_events => 0,
1144 %arg 1184 %arg
1145 ); 1185 );
1146 1186
1147 if (exists $self->{template}) { 1187 if (exists $self->{template}) {
… …
1271 1311
1272sub new { 1312sub new {
1273 my $class = shift; 1313 my $class = shift;
1274 1314
1275 $class->SUPER::new ( 1315 $class->SUPER::new (
1276 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1317 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1318 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1319 active_fg => [0, 0, 0],
1280 can_hover => 1, 1320 can_hover => 1,
1281 can_focus => 1, 1321 can_focus => 1,
1282 valign => 0, 1322 valign => 0,
1283 can_events => 1, 1323 can_events => 1,
1284 @_ 1324 @_
1285 ) 1325 )
1286} 1326}
1287 1327
… …
1441 my ($self, $ev) = @_; 1481 my ($self, $ev) = @_;
1442 1482
1443 my $sym = $ev->{sym}; 1483 my $sym = $ev->{sym};
1444 1484
1445 if ($sym == 13) { 1485 if ($sym == 13) {
1486 unshift @{$self->{history}},
1487 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1490 $self->emit (activate => $txt);
1447 $self->update; 1491 $self->update;
1492
1493 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text;
1496 }
1497 if (@{$self->{history} || []} > 0) {
1498 $self->{history_pointer}++;
1499 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1500 $self->{history_pointer} = @{$self->{history} || []} - 1;
1501 }
1502 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1503 }
1504
1505 } elsif ($sym == CFClient::SDLK_DOWN) {
1506 $self->{history_pointer}--;
1507 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1508
1509 if ($self->{history_pointer} >= 0) {
1510 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1511 } else {
1512 $self->set_text ($self->{history_saveback});
1513 }
1448 1514
1449 } else { 1515 } else {
1450 $self->SUPER::key_down ($ev); 1516 $self->SUPER::key_down ($ev);
1451 } 1517 }
1452 1518
… …
1466 1532
1467sub new { 1533sub new {
1468 my $class = shift; 1534 my $class = shift;
1469 1535
1470 $class->SUPER::new ( 1536 $class->SUPER::new (
1471 padding => 4, 1537 padding => 4,
1472 fg => [1, 1, 1], 1538 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1539 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1540 active_fg => [0, 0, 1],
1475 can_hover => 1, 1541 can_hover => 1,
1476 align => 0, 1542 align => 0,
1477 valign => 0, 1543 valign => 0,
1478 can_events => 1, 1544 can_events => 1,
1479 @_ 1545 @_
1480 ) 1546 )
1481} 1547}
1482 1548
… …
1773 1839
1774sub new { 1840sub new {
1775 my ($class, %arg) = @_; 1841 my ($class, %arg) = @_;
1776 1842
1777 my $self = $class->SUPER::new ( 1843 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1844 tooltip => $arg{type},
1845 can_hover => 1,
1779 can_events => 1, 1846 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1847 %arg,
1782 ); 1848 );
1783 1849
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1850 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1851 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1957 2023
1958sub new { 2024sub new {
1959 my $class = shift; 2025 my $class = shift;
1960 2026
1961 my $self = $class->SUPER::new ( 2027 my $self = $class->SUPER::new (
1962 fontsize => 1, 2028 fontsize => 1,
2029 can_events => 0,
1963 #font => default_font 2030 #font => default_font
1964 @_, 2031 @_,
1965 2032
1966 layout => (new CFClient::Layout), 2033 layout => (new CFClient::Layout),
1967 par => [], 2034 par => [],
1968 height => 0, 2035 height => 0,
1969 children => [ 2036 children => [
1970 (new CFClient::UI::Empty expand => 1), 2037 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2038 (new CFClient::UI::Slider vertical => 1),
1972 ], 2039 ],
1973 ); 2040 );
1974 2041
… …
2099 my ($self) = @_; 2166 my ($self) = @_;
2100 2167
2101 if ($self->{texture}) { 2168 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2105 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
2106 } 2174 }
2107 2175
2108 $self->{children}[1]->draw; 2176 $self->{children}[1]->draw;
… …
2159 2227
2160sub new { 2228sub new {
2161 my $class = shift; 2229 my $class = shift;
2162 2230
2163 my $self = $class->SUPER::new ( 2231 my $self = $class->SUPER::new (
2164 state => 0, 2232 state => 0,
2165 connect_activate => \&toggle_flopper, 2233 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2234 @_
2168 ); 2235 );
2169 2236
2170 if ($self->{state}) { 2237 if ($self->{state}) {
2171 $self->{state} = 0; 2238 $self->{state} = 0;

Diff Legend

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