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.163 by root, Mon Apr 24 06:40:29 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) = @_;
… …
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
… …
492 517
493sub remove { 518sub remove {
494 my ($self, $child) = @_; 519 my ($self, $child) = @_;
495 520
496 delete $child->{parent}; 521 delete $child->{parent};
522 $child->hide;
497 523
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 525
500 $self->check_size; 526 $self->check_size;
501 $self->update; 527 $self->update;
528}
529
530sub clear {
531 my ($self) = @_;
532
533 my $children = delete $self->{children};
534 $self->{children} = [];
535
536 for (@$children) {
537 delete $_->{parent};
538 $_->hide;
539 }
502} 540}
503 541
504sub find_widget { 542sub find_widget {
505 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
506 544
… …
874 912
875# TODO: move to container class maybe? send childs a signal on removal? 913# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 914sub clear {
877 my ($self) = @_; 915 my ($self) = @_;
878 916
879 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
880 $self->update; 924 $self->update;
881} 925}
882 926
883sub get_wh { 927sub get_wh {
884 my ($self) = @_; 928 my ($self) = @_;
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1176
1133 $self 1177 $self
1134} 1178}
1135 1179
1136sub escape_text { 1180sub escape {
1137 local $_ = $_[1]; 1181 local $_ = $_[1];
1138 1182
1139 s/&/&amp;/g; 1183 s/&/&amp;/g;
1140 s/>/&gt;/g; 1184 s/>/&gt;/g;
1141 s/</&lt;/g; 1185 s/</&lt;/g;
… …
2183 @_, 2227 @_,
2184 can_events => 0, 2228 can_events => 0,
2185 ) 2229 )
2186} 2230}
2187 2231
2188sub set_text { 2232sub set_markup {
2189 my ($self, $text) = @_; 2233 my ($self, $text) = @_;
2190 2234
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2235 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2192 $self->{label}->set_text ($text); 2236 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2237 $self->add ($self->{label});
2194} 2238}
2195 2239
2196sub size_request { 2240sub size_request {
2197 my ($self) = @_; 2241 my ($self) = @_;
… …
2199 $self->child->set_max_size ($::WIDTH * 0.3); 2243 $self->child->set_max_size ($::WIDTH * 0.3);
2200 2244
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2245 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2246
2203 ($w + 4, $h + 4) 2247 ($w + 4, $h + 4)
2248}
2249
2250sub size_allocate {
2251 my ($self, $w, $h) = @_;
2252
2253 $self->SUPER::size_allocate ($w - 4, $h - 4);
2204} 2254}
2205 2255
2206sub _draw { 2256sub _draw {
2207 my ($self) = @_; 2257 my ($self) = @_;
2208 2258
… …
2233 $self->SUPER::_draw; 2283 $self->SUPER::_draw;
2234} 2284}
2235 2285
2236############################################################################# 2286#############################################################################
2237 2287
2288package CFClient::UI::Face;
2289
2290our @ISA = CFClient::UI::Base::;
2291
2292use CFClient::OpenGL;
2293
2294sub new {
2295 my $class = shift;
2296
2297 $class->SUPER::new (
2298 aspect => 1,
2299 @_,
2300 )
2301}
2302
2303sub size_request {
2304 (32, 8)
2305}
2306
2307sub draw {
2308 my ($self) = @_;
2309
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311
2312 if ($tex) {
2313 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317 glColor 1, 1, 1, 1;
2318 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2319 glDisable GL_TEXTURE_2D;
2320 glDisable GL_BLEND;
2321 }
2322}
2323
2324#############################################################################
2325
2238package CFClient::UI::Root; 2326package CFClient::UI::Root;
2239 2327
2240our @ISA = CFClient::UI::Container::; 2328our @ISA = CFClient::UI::Container::;
2241 2329
2242use CFClient::OpenGL; 2330use CFClient::OpenGL;

Diff Legend

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