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.149 by root, Sat Apr 22 23:11:32 2006 UTC vs.
Revision 1.151 by root, Sun Apr 23 00:57:39 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23 $TOOLTIP->set_text ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show;
26 }
27
28 return;
29 }
30 }
31 }
32
33 $TOOLTIP->hide;
34 delete $TOOLTIP->{owner};
35}
14 36
15# class methods for events 37# class methods for events
16sub feed_sdl_key_down_event { 38sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 39 $FOCUS->key_down ($_[0]) if $FOCUS;
18} 40}
… …
28 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 51 my $widget = $ROOT->find_widget ($x, $y);
30 52
31 $GRAB = $widget; 53 $GRAB = $widget;
32 $GRAB->update if $GRAB; 54 $GRAB->update if $GRAB;
55
56 check_tooltip;
33 } 57 }
34 58
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 59 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 60
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
… …
49 73
50 if (!$BUTTON_STATE) { 74 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 75 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 76 $grab->update if $grab;
53 $GRAB->update if $GRAB; 77 $GRAB->update if $GRAB;
78
79 check_tooltip;
54 } 80 }
55} 81}
56 82
57sub feed_sdl_motion_event { 83sub feed_sdl_motion_event {
58 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 89 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
65 91
66 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
94
95 check_tooltip;
68 } 96 }
69 97
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 99}
72 100
… …
96 124
97 my $self = bless { 125 my $self = bless {
98 x => 0, 126 x => 0,
99 y => 0, 127 y => 0,
100 z => 0, 128 z => 0,
129 can_events => 1,
101 @_ 130 @_
102 }, $class; 131 }, $class;
103 132
104 for (keys %$self) { 133 for (keys %$self) {
105 if (/^connect_(.*)$/) { 134 if (/^connect_(.*)$/) {
… …
278} 307}
279 308
280sub find_widget { 309sub find_widget {
281 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
282 311
312 return () unless $self->{can_events};
313
283 return $self 314 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 315 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 316 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 317
287 () 318 ()
… …
379 410
380package CFClient::UI::Empty; 411package CFClient::UI::Empty;
381 412
382our @ISA = CFClient::UI::Base::; 413our @ISA = CFClient::UI::Base::;
383 414
415sub new {
416 my ($class, %arg) = @_;
417 $class->SUPER::new (can_events => 0, %arg);
418}
419
384sub size_request { 420sub size_request {
385 (0, 0) 421 (0, 0)
386} 422}
387 423
388sub draw { } 424sub draw { }
… …
396sub new { 432sub new {
397 my ($class, %arg) = @_; 433 my ($class, %arg) = @_;
398 434
399 my $children = delete $arg{children} || []; 435 my $children = delete $arg{children} || [];
400 436
401 my $self = $class->SUPER::new (children => [], %arg); 437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
402 $self->add ($_) for @$children; 438 $self->add ($_) for @$children;
403 439
404 $self 440 $self
405} 441}
406 442
… …
425 delete $child->{parent}; 461 delete $child->{parent};
426 462
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 464
429 $self->check_size; 465 $self->check_size;
466 $self->update;
430} 467}
431 468
432sub find_widget { 469sub find_widget {
433 my ($self, $x, $y) = @_; 470 my ($self, $x, $y) = @_;
434 471
… …
660 697
661 my $self = $class->SUPER::new ( 698 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 699 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 700 border_bg => [1, 1, 1, 1],
664 border => 0.8, 701 border => 0.8,
702 can_events => 1,
665 @_ 703 @_
666 ); 704 );
667 705
668 $self->{title} &&= new CFClient::UI::Label 706 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 707 align => 0,
… …
1062 text => "", 1100 text => "",
1063 align => -1, 1101 align => -1,
1064 valign => -1, 1102 valign => -1,
1065 padding => 2, 1103 padding => 2,
1066 layout => new CFClient::Layout, 1104 layout => new CFClient::Layout,
1105 can_events => 0,
1067 %arg 1106 %arg
1068 ); 1107 );
1069 1108
1070 if (exists $self->{template}) { 1109 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1110 my $layout = new CFClient::Layout;
… …
1196 active_bg => [1, 1, 1, 0.5], 1235 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1236 active_fg => [0, 0, 0],
1198 can_hover => 1, 1237 can_hover => 1,
1199 can_focus => 1, 1238 can_focus => 1,
1200 valign => 0, 1239 valign => 0,
1240 can_events => 1,
1201 @_ 1241 @_
1202 ) 1242 )
1203} 1243}
1204 1244
1205sub _set_text { 1245sub _set_text {
… …
1390 bg => [1, 1, 1, 0.2], 1430 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1431 active_fg => [0, 0, 1],
1392 can_hover => 1, 1432 can_hover => 1,
1393 align => 0, 1433 align => 0,
1394 valign => 0, 1434 valign => 0,
1435 can_events => 1,
1395 @_ 1436 @_
1396 ) 1437 )
1397} 1438}
1398 1439
1399sub button_up { 1440sub button_up {
… …
1504our %loaded_images; 1545our %loaded_images;
1505 1546
1506sub new { 1547sub new {
1507 my $class = shift; 1548 my $class = shift;
1508 1549
1509 my $self = $class->SUPER::new (@_); 1550 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1551
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1552 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1553
1513 $loaded_images{$self->{image}} ||= 1554 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1555 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1673package CFClient::UI::Gauge; 1714package CFClient::UI::Gauge;
1674 1715
1675our @ISA = CFClient::UI::VBox::; 1716our @ISA = CFClient::UI::VBox::;
1676 1717
1677sub new { 1718sub new {
1678 my ($class, %arg) = shift; 1719 my ($class, %arg) = @_;
1679 1720
1680 my $self = $class->SUPER::new ( 1721 my $self = $class->SUPER::new (
1681 @_, 1722 tooltip => $arg{type},
1723 %arg,
1682 ); 1724 );
1683 1725
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1726 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1685 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1727 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1686 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1728 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1729
1688 $self 1730 $self
1689} 1731}
1690 1732
1691sub set_fontsize { 1733sub set_fontsize {
… …
2057 my $class = shift; 2099 my $class = shift;
2058 2100
2059 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2060 state => 0, 2102 state => 0,
2061 connect_activate => \&toggle_flopper, 2103 connect_activate => \&toggle_flopper,
2104 can_events => 1,
2062 @_ 2105 @_
2063 ); 2106 );
2064 2107
2065 if ($self->{state}) { 2108 if ($self->{state}) {
2066 $self->{state} = 0; 2109 $self->{state} = 0;
… …
2170############################################################################# 2213#############################################################################
2171 2214
2172package CFClient::UI; 2215package CFClient::UI;
2173 2216
2174$ROOT = new CFClient::UI::Root; 2217$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0;
2175 2219
21761 22201
2177 2221

Diff Legend

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