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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.170 by root, Mon Apr 24 11:45:17 2006 UTC

… …
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 } 31 }
32 32
33 return; 33 return;
… …
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
… …
233} 246}
234 247
235# return top left coordinates 248# return top left coordinates
236sub _topleft { 249sub _topleft {
237 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
251
252 $self->{parent}
253 or Carp::confess "no parent widget in _topleft\n";#d#
238 254
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 256}
241 257
242# translate global coordinates to local coordinate system 258# translate global coordinates to local coordinate system
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 336 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 337 glVertex $x , $y + $self->{h};
322 glEnd; 338 glEnd;
323 glDisable GL_BLEND; 339 glDisable GL_BLEND;
324 } 340 }
341
342 if ($ENV{PCLIENT_DEBUG}) {
343 glPushMatrix;
344 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0;
348 glVertex $self->{w}, 0;
349 glVertex $self->{w}, $self->{h};
350 glVertex 0 , $self->{h};
351 glEnd;
352 glPopMatrix;
353 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
354 }
325} 355}
326 356
327sub _draw { 357sub _draw {
328 my ($self) = @_; 358 my ($self) = @_;
329 359
… …
388} 418}
389 419
390sub emit { 420sub emit {
391 my ($self, $signal, @args) = @_; 421 my ($self, $signal, @args) = @_;
392 422
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 424}
397 425
398sub DESTROY { 426sub DESTROY {
399 my ($self) = @_; 427 my ($self) = @_;
400 428
… …
467sub new { 495sub new {
468 my ($class, %arg) = @_; 496 my ($class, %arg) = @_;
469 497
470 my $children = delete $arg{children} || []; 498 my $children = delete $arg{children} || [];
471 499
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 500 my $self = $class->SUPER::new (
501 children => [],
502 can_events => 0,
503 %arg,
504 );
473 $self->add ($_) for @$children; 505 $self->add ($_) for @$children;
474 506
475 $self 507 $self
476} 508}
477 509
… …
492 524
493sub remove { 525sub remove {
494 my ($self, $child) = @_; 526 my ($self, $child) = @_;
495 527
496 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
497 530
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 532
500 $self->check_size; 533 $self->check_size;
501 $self->update; 534 $self->update;
535}
536
537sub clear {
538 my ($self) = @_;
539
540 my $children = delete $self->{children};
541 $self->{children} = [];
542
543 for (@$children) {
544 delete $_->{parent};
545 $_->hide;
546 }
502} 547}
503 548
504sub find_widget { 549sub find_widget {
505 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
506 551
… …
710 my $class = shift; 755 my $class = shift;
711 756
712 # TODO: user_x, user_y, overwrite moveto? 757 # TODO: user_x, user_y, overwrite moveto?
713 758
714 my $self = $class->SUPER::new ( 759 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 760 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 761 border_bg => [1, 1, 1, 1],
717 border => 0.8, 762 border => 0.8,
718 can_events => 1, 763 can_events => 1,
719 @_ 764 @_
720 ); 765 );
721 766
722 $self->{title} &&= new CFClient::UI::Label 767 $self->{title} &&= new CFClient::UI::Label
… …
874 919
875# TODO: move to container class maybe? send childs a signal on removal? 920# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 921sub clear {
877 my ($self) = @_; 922 my ($self) = @_;
878 923
879 delete $self->{children}; 924 my $children = delete $self->{children};
925
926 for (grep $_, map @$_, grep $_, @$children) {
927 delete $_->{parent};
928 $_->hide;
929 }
930
880 $self->update; 931 $self->update;
881} 932}
882 933
883sub get_wh { 934sub get_wh {
884 my ($self) = @_; 935 my ($self) = @_;
… …
1107 1158
1108sub new { 1159sub new {
1109 my ($class, %arg) = @_; 1160 my ($class, %arg) = @_;
1110 1161
1111 my $self = $class->SUPER::new ( 1162 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1163 fg => [1, 1, 1],
1113 #font => default_font 1164 #font => default_font
1114 fontsize => 1, 1165 fontsize => 1,
1115 text => "", 1166 text => "",
1116 align => -1, 1167 align => -1,
1117 valign => -1, 1168 valign => -1,
1118 padding => 2, 1169 padding => 2,
1119 layout => new CFClient::Layout, 1170 layout => new CFClient::Layout,
1120 can_events => 0, 1171 can_events => 0,
1121 %arg 1172 %arg
1122 ); 1173 );
1123 1174
1124 if (exists $self->{template}) { 1175 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1182 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1183
1133 $self 1184 $self
1134} 1185}
1135 1186
1136sub escape_text { 1187sub escape {
1137 local $_ = $_[1]; 1188 local $_ = $_[1];
1138 1189
1139 s/&/&amp;/g; 1190 s/&/&amp;/g;
1140 s/>/&gt;/g; 1191 s/>/&gt;/g;
1141 s/</&lt;/g; 1192 s/</&lt;/g;
… …
1248 1299
1249sub new { 1300sub new {
1250 my $class = shift; 1301 my $class = shift;
1251 1302
1252 $class->SUPER::new ( 1303 $class->SUPER::new (
1253 fg => [1, 1, 1], 1304 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1305 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1306 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1307 active_fg => [0, 0, 0],
1257 can_hover => 1, 1308 can_hover => 1,
1258 can_focus => 1, 1309 can_focus => 1,
1259 valign => 0, 1310 valign => 0,
1260 can_events => 1, 1311 can_events => 1,
1261 @_ 1312 @_
1262 ) 1313 )
1263} 1314}
1264 1315
… …
1418 my ($self, $ev) = @_; 1469 my ($self, $ev) = @_;
1419 1470
1420 my $sym = $ev->{sym}; 1471 my $sym = $ev->{sym};
1421 1472
1422 if ($sym == 13) { 1473 if ($sym == 13) {
1474 unshift @{$self->{history}},
1475 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1478 $self->emit (activate => $txt);
1424 $self->update; 1479 $self->update;
1480
1481 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text;
1484 }
1485 if (@{$self->{history} || []} > 0) {
1486 $self->{history_pointer}++;
1487 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1488 $self->{history_pointer} = @{$self->{history} || []} - 1;
1489 }
1490 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1491 }
1492
1493 } elsif ($sym == CFClient::SDLK_DOWN) {
1494 $self->{history_pointer}--;
1495 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1496
1497 if ($self->{history_pointer} >= 0) {
1498 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1499 } else {
1500 $self->set_text ($self->{history_saveback});
1501 }
1425 1502
1426 } else { 1503 } else {
1427 $self->SUPER::key_down ($ev); 1504 $self->SUPER::key_down ($ev);
1428 } 1505 }
1429 1506
… …
1443 1520
1444sub new { 1521sub new {
1445 my $class = shift; 1522 my $class = shift;
1446 1523
1447 $class->SUPER::new ( 1524 $class->SUPER::new (
1448 padding => 4, 1525 padding => 4,
1449 fg => [1, 1, 1], 1526 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1527 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1528 active_fg => [0, 0, 1],
1452 can_hover => 1, 1529 can_hover => 1,
1453 align => 0, 1530 align => 0,
1454 valign => 0, 1531 valign => 0,
1455 can_events => 1, 1532 can_events => 1,
1456 @_ 1533 @_
1457 ) 1534 )
1458} 1535}
1459 1536
… …
1750 1827
1751sub new { 1828sub new {
1752 my ($class, %arg) = @_; 1829 my ($class, %arg) = @_;
1753 1830
1754 my $self = $class->SUPER::new ( 1831 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1832 tooltip => $arg{type},
1756 can_events => 1,
1757 can_hover => 1, 1833 can_hover => 1,
1758 %arg, 1834 %arg,
1759 ); 1835 );
1760 1836
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1837 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
… …
1934 2010
1935sub new { 2011sub new {
1936 my $class = shift; 2012 my $class = shift;
1937 2013
1938 my $self = $class->SUPER::new ( 2014 my $self = $class->SUPER::new (
1939 fontsize => 1, 2015 fontsize => 1,
2016 can_events => 0,
1940 #font => default_font 2017 #font => default_font
1941 @_, 2018 @_,
1942 2019
1943 layout => (new CFClient::Layout), 2020 layout => (new CFClient::Layout),
1944 par => [], 2021 par => [],
1945 height => 0, 2022 height => 0,
1946 children => [ 2023 children => [
1947 (new CFClient::UI::Empty expand => 1), 2024 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2025 (new CFClient::UI::Slider vertical => 1),
1949 ], 2026 ],
1950 ); 2027 );
1951 2028
… …
2136 2213
2137sub new { 2214sub new {
2138 my $class = shift; 2215 my $class = shift;
2139 2216
2140 my $self = $class->SUPER::new ( 2217 my $self = $class->SUPER::new (
2141 state => 0, 2218 state => 0,
2142 connect_activate => \&toggle_flopper, 2219 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2220 @_
2145 ); 2221 );
2146 2222
2147 if ($self->{state}) { 2223 if ($self->{state}) {
2148 $self->{state} = 0; 2224 $self->{state} = 0;
… …
2183 @_, 2259 @_,
2184 can_events => 0, 2260 can_events => 0,
2185 ) 2261 )
2186} 2262}
2187 2263
2188sub set_text { 2264sub set_markup {
2189 my ($self, $text) = @_; 2265 my ($self, $text) = @_;
2190 2266
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2267 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2192 $self->{label}->set_text ($text); 2268 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2269 $self->add ($self->{label});
2194} 2270}
2195 2271
2196sub size_request { 2272sub size_request {
2197 my ($self) = @_; 2273 my ($self) = @_;
… …
2199 $self->child->set_max_size ($::WIDTH * 0.3); 2275 $self->child->set_max_size ($::WIDTH * 0.3);
2200 2276
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2277 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2278
2203 ($w + 4, $h + 4) 2279 ($w + 4, $h + 4)
2280}
2281
2282sub size_allocate {
2283 my ($self, $w, $h) = @_;
2284
2285 $self->SUPER::size_allocate ($w - 4, $h - 4);
2204} 2286}
2205 2287
2206sub _draw { 2288sub _draw {
2207 my ($self) = @_; 2289 my ($self) = @_;
2208 2290
… …
2233 $self->SUPER::_draw; 2315 $self->SUPER::_draw;
2234} 2316}
2235 2317
2236############################################################################# 2318#############################################################################
2237 2319
2320package CFClient::UI::Face;
2321
2322our @ISA = CFClient::UI::Base::;
2323
2324use CFClient::OpenGL;
2325
2326sub new {
2327 my $class = shift;
2328
2329 $class->SUPER::new (
2330 aspect => 1,
2331 @_,
2332 )
2333}
2334
2335sub size_request {
2336 (32, 8)
2337}
2338
2339sub draw {
2340 my ($self) = @_;
2341
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2343
2344 if ($tex) {
2345 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1;
2350 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2351 glDisable GL_TEXTURE_2D;
2352 glDisable GL_BLEND;
2353 }
2354}
2355
2356#############################################################################
2357
2238package CFClient::UI::Root; 2358package CFClient::UI::Root;
2239 2359
2240our @ISA = CFClient::UI::Container::; 2360our @ISA = CFClient::UI::Container::;
2241 2361
2242use CFClient::OpenGL; 2362use CFClient::OpenGL;

Diff Legend

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