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.159 by root, Mon Apr 24 03:19:42 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
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
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
322 glEnd; 335 glEnd;
323 glDisable GL_BLEND; 336 glDisable GL_BLEND;
324 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
325} 352}
326 353
327sub _draw { 354sub _draw {
328 my ($self) = @_; 355 my ($self) = @_;
329 356
… …
388} 415}
389 416
390sub emit { 417sub emit {
391 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
392 419
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 421}
397 422
398sub DESTROY { 423sub DESTROY {
399 my ($self) = @_; 424 my ($self) = @_;
400 425
… …
467sub new { 492sub new {
468 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
469 494
470 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
471 496
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
473 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
474 503
475 $self 504 $self
476} 505}
477 506
… …
492 521
493sub remove { 522sub remove {
494 my ($self, $child) = @_; 523 my ($self, $child) = @_;
495 524
496 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
497 527
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 529
500 $self->check_size; 530 $self->check_size;
501 $self->update; 531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
502} 544}
503 545
504sub find_widget { 546sub find_widget {
505 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
506 548
… …
710 my $class = shift; 752 my $class = shift;
711 753
712 # TODO: user_x, user_y, overwrite moveto? 754 # TODO: user_x, user_y, overwrite moveto?
713 755
714 my $self = $class->SUPER::new ( 756 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 757 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 758 border_bg => [1, 1, 1, 1],
717 border => 0.8, 759 border => 0.8,
718 can_events => 1, 760 can_events => 1,
719 @_ 761 @_
720 ); 762 );
721 763
722 $self->{title} &&= new CFClient::UI::Label 764 $self->{title} &&= new CFClient::UI::Label
… …
874 916
875# TODO: move to container class maybe? send childs a signal on removal? 917# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 918sub clear {
877 my ($self) = @_; 919 my ($self) = @_;
878 920
879 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
880 $self->update; 928 $self->update;
881} 929}
882 930
883sub get_wh { 931sub get_wh {
884 my ($self) = @_; 932 my ($self) = @_;
… …
1107 1155
1108sub new { 1156sub new {
1109 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1110 1158
1111 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
1113 #font => default_font 1161 #font => default_font
1114 fontsize => 1, 1162 fontsize => 1,
1115 text => "", 1163 text => "",
1116 align => -1, 1164 align => -1,
1117 valign => -1, 1165 valign => -1,
1118 padding => 2, 1166 padding => 2,
1119 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1120 can_events => 0, 1168 can_events => 0,
1121 %arg 1169 %arg
1122 ); 1170 );
1123 1171
1124 if (exists $self->{template}) { 1172 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1180
1133 $self 1181 $self
1134} 1182}
1135 1183
1136sub escape_text { 1184sub escape {
1137 local $_ = $_[1]; 1185 local $_ = $_[1];
1138 1186
1139 s/&/&amp;/g; 1187 s/&/&amp;/g;
1140 s/>/&gt;/g; 1188 s/>/&gt;/g;
1141 s/</&lt;/g; 1189 s/</&lt;/g;
… …
1248 1296
1249sub new { 1297sub new {
1250 my $class = shift; 1298 my $class = shift;
1251 1299
1252 $class->SUPER::new ( 1300 $class->SUPER::new (
1253 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1257 can_hover => 1, 1305 can_hover => 1,
1258 can_focus => 1, 1306 can_focus => 1,
1259 valign => 0, 1307 valign => 0,
1260 can_events => 1, 1308 can_events => 1,
1261 @_ 1309 @_
1262 ) 1310 )
1263} 1311}
1264 1312
… …
1418 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1419 1467
1420 my $sym = $ev->{sym}; 1468 my $sym = $ev->{sym};
1421 1469
1422 if ($sym == 13) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1423 $self->emit (activate => $self->get_text); 1474 $self->emit (activate => $txt);
1424 $self->update; 1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1425 1496
1426 } else { 1497 } else {
1427 $self->SUPER::key_down ($ev); 1498 $self->SUPER::key_down ($ev);
1428 } 1499 }
1429 1500
… …
1443 1514
1444sub new { 1515sub new {
1445 my $class = shift; 1516 my $class = shift;
1446 1517
1447 $class->SUPER::new ( 1518 $class->SUPER::new (
1448 padding => 4, 1519 padding => 4,
1449 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1522 active_fg => [0, 0, 1],
1452 can_hover => 1, 1523 can_hover => 1,
1453 align => 0, 1524 align => 0,
1454 valign => 0, 1525 valign => 0,
1455 can_events => 1, 1526 can_events => 1,
1456 @_ 1527 @_
1457 ) 1528 )
1458} 1529}
1459 1530
… …
1750 1821
1751sub new { 1822sub new {
1752 my ($class, %arg) = @_; 1823 my ($class, %arg) = @_;
1753 1824
1754 my $self = $class->SUPER::new ( 1825 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1826 tooltip => $arg{type},
1827 can_hover => 1,
1756 %arg, 1828 %arg,
1757 ); 1829 );
1758 1830
1759 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1760 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1761 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1762 1834
1763 $self 1835 $self
1764} 1836}
1765 1837
1766sub set_fontsize { 1838sub set_fontsize {
… …
1932 2004
1933sub new { 2005sub new {
1934 my $class = shift; 2006 my $class = shift;
1935 2007
1936 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1937 fontsize => 1, 2009 fontsize => 1,
2010 can_events => 0,
1938 #font => default_font 2011 #font => default_font
1939 @_, 2012 @_,
1940 2013
1941 layout => (new CFClient::Layout), 2014 layout => (new CFClient::Layout),
1942 par => [], 2015 par => [],
1943 height => 0, 2016 height => 0,
1944 children => [ 2017 children => [
1945 (new CFClient::UI::Empty expand => 1), 2018 (new CFClient::UI::Empty expand => 1),
1946 (new CFClient::UI::Slider vertical => 1), 2019 (new CFClient::UI::Slider vertical => 1),
1947 ], 2020 ],
1948 ); 2021 );
1949 2022
… …
2134 2207
2135sub new { 2208sub new {
2136 my $class = shift; 2209 my $class = shift;
2137 2210
2138 my $self = $class->SUPER::new ( 2211 my $self = $class->SUPER::new (
2139 state => 0, 2212 state => 0,
2140 connect_activate => \&toggle_flopper, 2213 connect_activate => \&toggle_flopper,
2141 can_events => 1,
2142 @_ 2214 @_
2143 ); 2215 );
2144 2216
2145 if ($self->{state}) { 2217 if ($self->{state}) {
2146 $self->{state} = 0; 2218 $self->{state} = 0;
… …
2181 @_, 2253 @_,
2182 can_events => 0, 2254 can_events => 0,
2183 ) 2255 )
2184} 2256}
2185 2257
2186sub set_text { 2258sub set_markup {
2187 my ($self, $text) = @_; 2259 my ($self, $text) = @_;
2188 2260
2189 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2190 $self->{label}->set_text ($text); 2262 $self->{label}->set_markup ($text);
2191 $self->add ($self->{label}); 2263 $self->add ($self->{label});
2192} 2264}
2193 2265
2194sub size_request { 2266sub size_request {
2195 my ($self) = @_; 2267 my ($self) = @_;
2196 2268
2197 $self->child->set_max_size ($::WIDTH * 0.2); 2269 $self->child->set_max_size ($::WIDTH * 0.3);
2198 2270
2199 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2200 2272
2201 ($w + 4, $h + 4) 2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2202} 2280}
2203 2281
2204sub _draw { 2282sub _draw {
2205 my ($self) = @_; 2283 my ($self) = @_;
2206 2284
… …
2231 $self->SUPER::_draw; 2309 $self->SUPER::_draw;
2232} 2310}
2233 2311
2234############################################################################# 2312#############################################################################
2235 2313
2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
2236package CFClient::UI::Root; 2352package CFClient::UI::Root;
2237 2353
2238our @ISA = CFClient::UI::Container::; 2354our @ISA = CFClient::UI::Container::;
2239 2355
2240use CFClient::OpenGL; 2356use CFClient::OpenGL;

Diff Legend

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