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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.173 by root, Tue Apr 25 10:30:48 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 (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
62
63 check_tooltip;
33 } 64 }
34 65
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $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 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $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 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
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 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
… …
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
145 can_events => 1,
101 @_ 146 @_
102 }, $class; 147 }, $class;
103 148
104 for (keys %$self) { 149 for (keys %$self) {
105 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
… …
108 } 153 }
109 154
110 $self 155 $self
111} 156}
112 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
113sub show { 165sub show {
114 my ($self) = @_; 166 my ($self) = @_;
115 167
116 return if $self->{parent}; 168 return if $self->{parent};
117 169
… …
119} 171}
120 172
121sub hide { 173sub hide {
122 my ($self) = @_; 174 my ($self) = @_;
123 175
124 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
125 178
126 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
127} 181}
128 182
129sub move { 183sub move {
130 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
131 185
… …
134 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
135 189
136 $self->update; 190 $self->update;
137} 191}
138 192
139sub needs_redraw { 193sub set_size {
140 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
141} 200}
142 201
143sub size_request { 202sub size_request {
144 require Carp; 203 require Carp;
145 Carp::confess "size_request is abstract"; 204 Carp::confess "size_request is abstract";
… …
177 236
178sub size_allocate { 237sub size_allocate {
179 # nothing to be done 238 # nothing to be done
180} 239}
181 240
241sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size {
255 my ($self, $w, $h) = @_;
256
257 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
182# return top left coordinates 261# return top left coordinates
183sub _topleft { 262sub _topleft {
184 my ($self, $x, $y) = @_; 263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
185 267
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 269}
188 270
189# translate global coordinates to local coordinate system 271# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 349 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 350 glVertex $x , $y + $self->{h};
269 glEnd; 351 glEnd;
270 glDisable GL_BLEND; 352 glDisable GL_BLEND;
271 } 353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0;
361 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h};
364 glEnd;
365 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 }
272} 368}
273 369
274sub _draw { 370sub _draw {
275 my ($self) = @_; 371 my ($self) = @_;
276 372
277 warn "no draw defined for $self\n"; 373 warn "no draw defined for $self\n";
278} 374}
279 375
280sub find_widget { 376sub find_widget {
281 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
282 380
283 return $self 381 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 384
… …
294} 392}
295 393
296sub check_size { 394sub check_size {
297 my ($self) = @_; 395 my ($self) = @_;
298 396
299 my ($w, $h) = $self->size_request; 397 $self->{parent}
398 or return 1;
300 399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 405 $self->{req_w} = $w;
303 $self->{req_h} = $h; 406 $self->{req_h} = $h;
304 407
305 $self->{parent}->check_size 408 $self->{parent}->check_size
306 if $self->{parent}; 409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
307 } 417 }
308} 418}
309 419
310sub update { 420sub update {
311 my ($self) = @_; 421 my ($self) = @_;
… …
321} 431}
322 432
323sub emit { 433sub emit {
324 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
325 435
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 437}
330 438
331sub DESTROY { 439sub DESTROY {
332 my ($self) = @_; 440 my ($self) = @_;
333 441
… …
378 486
379package CFClient::UI::Empty; 487package CFClient::UI::Empty;
380 488
381our @ISA = CFClient::UI::Base::; 489our @ISA = CFClient::UI::Base::;
382 490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
383sub size_request { 496sub size_request {
384 (0, 0) 497 (0, 0)
385} 498}
386 499
387sub draw { } 500sub draw { }
… …
395sub new { 508sub new {
396 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
397 510
398 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
399 512
400 my $self = $class->SUPER::new (children => [], %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
401 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
402 519
403 $self 520 $self
404} 521}
405 522
… …
416 ]; 533 ];
417 534
418 $child->check_size; 535 $child->check_size;
419} 536}
420 537
538sub children {
539 @{ $_[0]{children} }
540}
541
421sub remove { 542sub remove {
422 my ($self, $child) = @_; 543 my ($self, $child) = @_;
423 544
424 delete $child->{parent}; 545 delete $child->{parent};
546 $child->hide;
425 547
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 549
428 $self->check_size; 550 $self->check_size;
551 $self->update;
552}
553
554sub clear {
555 my ($self) = @_;
556
557 my $children = delete $self->{children};
558 $self->{children} = [];
559
560 for (@$children) {
561 delete $_->{parent};
562 $_->hide;
563 }
429} 564}
430 565
431sub find_widget { 566sub find_widget {
432 my ($self, $x, $y) = @_; 567 my ($self, $x, $y) = @_;
433 568
… …
561sub new { die } 696sub new { die }
562 697
563sub size_request { 698sub size_request {
564 my ($self) = @_; 699 my ($self) = @_;
565 700
566 @$self{qw(child_w child_h)} = $self->child->size_request; 701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 703
569 @$self{qw(child_w child_h)} 704 @$self{qw(child_w child_h)}
570} 705}
571 706
… …
593 border => 0.8, 728 border => 0.8,
594 @_ 729 @_
595 ); 730 );
596 731
597 $self 732 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605}
606
607sub size_request {
608 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h})
610}
611
612sub size_allocate {
613 my ($self, $w, $h) = @_;
614 $self->{w} = $w;
615 $self->{h} = $h;
616 $self->child->configure (0, 0, $w, $h);
617} 733}
618 734
619sub _draw { 735sub _draw {
620 my ($self) = @_; 736 my ($self) = @_;
621 737
… …
656 my $class = shift; 772 my $class = shift;
657 773
658 # TODO: user_x, user_y, overwrite moveto? 774 # TODO: user_x, user_y, overwrite moveto?
659 775
660 my $self = $class->SUPER::new ( 776 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 777 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 778 border_bg => [1, 1, 1, 1],
663 border => 0.8, 779 border => 0.8,
780 can_events => 1,
664 @_ 781 @_
665 ); 782 );
666 783
667 $self->{title} &&= new CFClient::UI::Label 784 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 785 align => 0,
… …
678} 795}
679 796
680sub size_request { 797sub size_request {
681 my ($self) = @_; 798 my ($self) = @_;
682 799
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684
685 my ($w, $h) = $self->SUPER::size_request; 800 my ($w, $h) = $self->SUPER::size_request;
686 801
687 ( 802 (
688 $w + $self->border * 2, 803 $w + $self->border * 2,
689 $h + $self->border * 2, 804 $h + $self->border * 2,
… …
817 $self->{children}[$y][$x] = $child; 932 $self->{children}[$y][$x] = $child;
818 933
819 $child->check_size; 934 $child->check_size;
820} 935}
821 936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
822# TODO: move to container class maybe? send childs a signal on removal? 941# TODO: move to container class maybe? send childs a signal on removal?
823sub clear { 942sub clear {
824 my ($self) = @_; 943 my ($self) = @_;
825 944
945 my @children = $self->children;
826 delete $self->{children}; 946 delete $self->{children};
947
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
827 $self->update; 953 $self->update;
828} 954}
829 955
830sub get_wh { 956sub get_wh {
831 my ($self) = @_; 957 my ($self) = @_;
… …
837 or next; 963 or next;
838 964
839 for my $x (0 .. $#$row) { 965 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 966 my $widget = $row->[$x]
841 or next; 967 or next;
842 my ($w, $h) = $widget->size_request; 968 my ($w, $h) = @$widget{qw(req_w req_h)};
843 969
844 $w[$x] = max $w[$x], $w; 970 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 971 $h[$y] = max $h[$y], $h;
846 } 972 }
847 } 973 }
… …
952 1078
953 ($h, $w) = ($w, $h); 1079 ($h, $w) = ($w, $h);
954 1080
955 my $children = $self->{children}; 1081 my $children = $self->{children};
956 1082
957 my @h = map +($_->size_request)[0], @$children; 1083 my @h = map $_->{req_w}, @$children;
958 1084
959 my $req_h = List::Util::sum @h; 1085 my $req_h = List::Util::sum @h;
960 1086
961 if ($req_h > $h) { 1087 if ($req_h > $h) {
962 # ah well, not enough space 1088 # ah well, not enough space
… …
1010sub size_allocate { 1136sub size_allocate {
1011 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1012 1138
1013 my $children = $self->{children}; 1139 my $children = $self->{children};
1014 1140
1015 my @h = map +($_->size_request)[1], @$children; 1141 my @h = map $_->{req_h}, @$children;
1016 1142
1017 my $req_h = List::Util::sum @h; 1143 my $req_h = List::Util::sum @h;
1018 1144
1019 if ($req_h > $h) { 1145 if ($req_h > $h) {
1020 # ah well, not enough space 1146 # ah well, not enough space
… …
1054 1180
1055sub new { 1181sub new {
1056 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
1057 1183
1058 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
1186 #font => default_font
1060 fontsize => 1, 1187 fontsize => 1,
1061 text => "", 1188 text => "",
1062 align => -1, 1189 align => -1,
1063 valign => -1, 1190 valign => -1,
1064 padding => 2, 1191 padding => 2,
1065 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1193 can_events => 0,
1066 %arg 1194 %arg
1067 ); 1195 );
1068 1196
1069 if (exists $self->{template}) { 1197 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1198 my $layout = new CFClient::Layout;
… …
1076 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1077 1205
1078 $self 1206 $self
1079} 1207}
1080 1208
1081sub escape_text { 1209sub escape {
1082 local $_ = $_[1]; 1210 local $_ = $_[1];
1083 1211
1084 s/&/&amp;/g; 1212 s/&/&amp;/g;
1085 s/>/&gt;/g; 1213 s/>/&gt;/g;
1086 s/</&lt;/g; 1214 s/</&lt;/g;
1087 1215
1088 $_[1] 1216 $_[1]
1089} 1217}
1090 1218
1219sub update {
1220 my ($self) = @_;
1221
1222 delete $self->{texture};
1223 $self->SUPER::update;
1224}
1225
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1091sub set_text { 1232sub set_text {
1092 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
1093 1234
1235 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text";
1237
1094 $self->{layout}->set_text ($text); 1238 $self->{layout}->set_text ($text);
1095 1239
1096 delete $self->{texture}; 1240 delete $self->{texture};
1097 $self->update; 1241 $self->update;
1242 $self->check_size;
1098} 1243}
1099 1244
1100sub set_markup { 1245sub set_markup {
1101 my ($self, $markup) = @_; 1246 my ($self, $markup) = @_;
1102 1247
1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1103 $self->{layout}->set_markup ($markup); 1251 $self->{layout}->set_markup ($markup);
1104 1252
1105 delete $self->{texture}; 1253 delete $self->{texture};
1106 $self->update; 1254 $self->update;
1255 $self->check_size;
1107} 1256}
1108 1257
1109sub size_request { 1258sub size_request {
1110 my ($self) = @_; 1259 my ($self) = @_;
1111 1260
1112 $self->{layout}->set_width; 1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1264
1115 my ($w, $h) = $self->{layout}->size; 1265 my ($w, $h) = $self->{layout}->size;
1116 1266
1117 if (exists $self->{template}) { 1267 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1270
1120 my ($w2, $h2) = $self->{template}->size; 1271 my ($w2, $h2) = $self->{template}->size;
1121 1272
1122 $w = List::Util::max $w, $w2; 1273 $w = List::Util::max $w, $w2;
… …
1137 1288
1138sub set_fontsize { 1289sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1290 my ($self, $fontsize) = @_;
1140 1291
1141 $self->{fontsize} = $fontsize; 1292 $self->{fontsize} = $fontsize;
1293 delete $self->{texture};
1142 $self->check_size; 1294 $self->check_size;
1295 $self->update;
1143} 1296}
1144 1297
1145sub _draw { 1298sub _draw {
1146 my ($self) = @_; 1299 my ($self) = @_;
1147 1300
1148 my $tex = $self->{texture} ||= do { 1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $self->{layout}->set_width ($self->{w}); 1303 $self->{layout}->set_width ($self->{w});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1151 new_from_layout CFClient::Texture $self->{layout} 1305 new_from_layout CFClient::Texture $self->{layout}
1152 }; 1306 };
1153 1307
… …
1186 1340
1187sub new { 1341sub new {
1188 my $class = shift; 1342 my $class = shift;
1189 1343
1190 $class->SUPER::new ( 1344 $class->SUPER::new (
1191 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1195 can_hover => 1, 1349 can_hover => 1,
1196 can_focus => 1, 1350 can_focus => 1,
1197 valign => 0, 1351 valign => 0,
1352 can_events => 1,
1198 @_ 1353 @_
1199 ) 1354 )
1200} 1355}
1201 1356
1202sub _set_text { 1357sub _set_text {
… …
1230} 1385}
1231 1386
1232sub size_allocate { 1387sub size_allocate {
1233 my ($self, $w, $h) = @_; 1388 my ($self, $w, $h) = @_;
1234 1389
1235 $self->_set_text ($self->{text}); 1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236} 1391}
1237 1392
1238sub set_text { 1393sub set_text {
1239 my ($self, $text) = @_; 1394 my ($self, $text) = @_;
1240 1395
… …
1355 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1356 1511
1357 my $sym = $ev->{sym}; 1512 my $sym = $ev->{sym};
1358 1513
1359 if ($sym == 13) { 1514 if ($sym == 13) {
1515 unshift @{$self->{history}},
1516 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1361 $self->update; 1520 $self->update;
1521
1522 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text;
1525 }
1526 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++;
1528 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1529 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 }
1533
1534 } elsif ($sym == CFClient::SDLK_DOWN) {
1535 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537
1538 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else {
1541 $self->set_text ($self->{history_saveback});
1542 }
1362 1543
1363 } else { 1544 } else {
1364 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1365 } 1546 }
1366 1547
… …
1380 1561
1381sub new { 1562sub new {
1382 my $class = shift; 1563 my $class = shift;
1383 1564
1384 $class->SUPER::new ( 1565 $class->SUPER::new (
1385 padding => 4, 1566 padding => 4,
1386 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1569 active_fg => [0, 0, 1],
1389 can_hover => 1, 1570 can_hover => 1,
1390 align => 0, 1571 align => 0,
1391 valign => 0, 1572 valign => 0,
1573 can_events => 1,
1392 @_ 1574 @_
1393 ) 1575 )
1394} 1576}
1395 1577
1396sub button_up { 1578sub button_up {
… …
1501our %loaded_images; 1683our %loaded_images;
1502 1684
1503sub new { 1685sub new {
1504 my $class = shift; 1686 my $class = shift;
1505 1687
1506 my $self = $class->SUPER::new (@_); 1688 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1689
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1690 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1691
1510 $loaded_images{$self->{image}} ||= 1692 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1693 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1553############################################################################# 1735#############################################################################
1554 1736
1555package CFClient::UI::VGauge; 1737package CFClient::UI::VGauge;
1556 1738
1557our @ISA = CFClient::UI::Base::; 1739our @ISA = CFClient::UI::Base::;
1740
1741use List::Util qw(min max);
1558 1742
1559use CFClient::OpenGL; 1743use CFClient::OpenGL;
1560 1744
1561my %tex = ( 1745my %tex = (
1562 food => [ 1746 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1749 ],
1566 grace => [ 1750 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1753 ],
1570 hp => [ 1754 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1757 ],
1574 mana => [ 1758 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1761 ],
1578); 1762);
1579 1763
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 1765sub new {
… …
1600} 1784}
1601 1785
1602sub set_max { 1786sub set_max {
1603 my ($self, $max) = @_; 1787 my ($self, $max) = @_;
1604 1788
1789 return if $self->{max_val} == $max;
1790
1605 $self->{max_val} = $max; 1791 $self->{max_val} = $max;
1792 $self->update;
1606} 1793}
1607 1794
1608sub set_value { 1795sub set_value {
1609 my ($self, $val, $max) = @_; 1796 my ($self, $val, $max) = @_;
1610 1797
1611 $self->set_max ($max) 1798 $self->set_max ($max)
1612 if defined $max; 1799 if defined $max;
1613 1800
1614 $max = $self->{max_val}; 1801 return if $self->{val} == $val;
1802
1615 $self->{val} = $val; 1803 $self->{val} = $val;
1616
1617 $self->update; 1804 $self->update;
1618} 1805}
1619 1806
1620sub _draw { 1807sub _draw {
1621 my ($self) = @_; 1808 my ($self) = @_;
1622 1809
1623 my $tex = $tex{$self->{type}}; 1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1624 1812
1625 my ($w, $h) = ($self->{w}, $self->{h}); 1813 my ($w, $h) = ($self->{w}, $self->{h});
1626 1814
1627 if ($self->{vertical}) { 1815 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 1816 glRotate 90, 0, 0, 1;
… …
1630 1818
1631 ($w, $h) = ($h, $w); 1819 ($w, $h) = ($h, $w);
1632 } 1820 }
1633 1821
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 1823
1637 my $t1 = $tex->[0]; 1824 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 1825 my $ycut2 = max 0, min 1, $ycut - 1;
1826
1827 my $h1 = $self->{h} * (1 - $ycut1);
1828 my $h2 = $self->{h} * (1 - $ycut2);
1639 1829
1640 glEnable GL_BLEND; 1830 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 1834
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 1836 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 1837 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 1841 glEnd;
1655 1842
1843 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 1845 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 1850 glEnd;
1851
1852 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd;
1860 }
1663 1861
1664 glDisable GL_BLEND; 1862 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 1863 glDisable GL_TEXTURE_2D;
1666} 1864}
1667 1865
… …
1670package CFClient::UI::Gauge; 1868package CFClient::UI::Gauge;
1671 1869
1672our @ISA = CFClient::UI::VBox::; 1870our @ISA = CFClient::UI::VBox::;
1673 1871
1674sub new { 1872sub new {
1675 my ($class, %arg) = shift; 1873 my ($class, %arg) = @_;
1676 1874
1677 my $self = $class->SUPER::new ( 1875 my $self = $class->SUPER::new (
1678 @_, 1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1879 %arg,
1679 ); 1880 );
1680 1881
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1882 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1883 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 1885
1685 $self 1886 $self
1686} 1887}
1687 1888
1688sub set_fontsize { 1889sub set_fontsize {
… …
1690 1891
1691 $self->{value}->set_fontsize ($fsize); 1892 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 1893 $self->{max} ->set_fontsize ($fsize);
1693} 1894}
1694 1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 $self->{gauge}->set_max ($max);
1900 $self->{max}->set_text ($max);
1901}
1902
1695sub set_value { 1903sub set_value {
1696 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1697 1905
1698 $self->set_max ($max) 1906 $self->set_max ($max)
1699 if defined $max; 1907 if defined $max;
1700 1908
1701 $self->{gauge}->set_value ($val, $max); 1909 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 1910 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 1911}
1711 1912
1712############################################################################# 1913#############################################################################
1713 1914
1714package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
… …
1854 2055
1855sub new { 2056sub new {
1856 my $class = shift; 2057 my $class = shift;
1857 2058
1858 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1859 fontsize => 1, 2060 fontsize => 1,
2061 can_events => 0,
2062 #font => default_font
1860 @_, 2063 @_,
1861 2064
1862 layout => (new CFClient::Layout), 2065 layout => (new CFClient::Layout),
1863 par => [], 2066 par => [],
1864 height => 0, 2067 height => 0,
1865 children => [ 2068 children => [
1866 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1868 ], 2071 ],
1869 ); 2072 );
1870 2073
… …
1904sub size_allocate { 2107sub size_allocate {
1905 my ($self, $w, $h) = @_; 2108 my ($self, $w, $h) = @_;
1906 2109
1907 $self->SUPER::size_allocate ($w, $h); 2110 $self->SUPER::size_allocate ($w, $h);
1908 2111
2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910 $self->{layout}->set_width ($self->{children}[0]{w}); 2114 $self->{layout}->set_width ($self->{children}[0]{w});
1911 2115
1912 $self->reflow; 2116 $self->reflow;
1913} 2117}
… …
1966 2170
1967 my $y = 0; 2171 my $y = 0;
1968 2172
1969 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
1970 2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
1971 for my $par (@{$self->{par}}) { 2177 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2178 my $h = $par->[0];
1973 2179
1974 if ($y0 < $y + $h && $y < $y1) { 2180 if ($y0 < $y + $h && $y < $y1) {
1975 $layout->set_text ($par->[2]); 2181 $layout->set_text ($par->[2]);
… …
1992 my ($self) = @_; 2198 my ($self) = @_;
1993 2199
1994 if ($self->{texture}) { 2200 if ($self->{texture}) {
1995 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1;
1997 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1998 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
1999 } 2206 }
2000 2207
2001 $self->{children}[1]->draw; 2208 $self->{children}[1]->draw;
… …
2052 2259
2053sub new { 2260sub new {
2054 my $class = shift; 2261 my $class = shift;
2055 2262
2056 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
2057 state => 0, 2264 state => 0,
2058 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
2059 @_ 2266 @_
2060 ); 2267 );
2061 2268
2062 if ($self->{state}) { 2269 if ($self->{state}) {
… …
2083 $self->emit (changed => $self->{state}); 2290 $self->emit (changed => $self->{state});
2084} 2291}
2085 2292
2086############################################################################# 2293#############################################################################
2087 2294
2295package CFClient::UI::Tooltip;
2296
2297our @ISA = CFClient::UI::Bin::;
2298
2299use CFClient::OpenGL;
2300
2301sub new {
2302 my $class = shift;
2303
2304 $class->SUPER::new (
2305 @_,
2306 can_events => 0,
2307 )
2308}
2309
2310sub set_markup {
2311 my ($self, $text) = @_;
2312
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2314 $self->{label}->set_markup ($text);
2315 $self->add ($self->{label});
2316}
2317
2318sub size_request {
2319 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324
2325 ($w + 4, $h + 4)
2326}
2327
2328sub size_allocate {
2329 my ($self, $w, $h) = @_;
2330
2331 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332}
2333
2334sub _draw {
2335 my ($self) = @_;
2336
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375;
2339
2340 my ($w, $h) = @$self{qw(w h)};
2341
2342 glColor 1, 0.8, 0.4;
2343 glBegin GL_QUADS;
2344 glVertex 0 , 0;
2345 glVertex 0 , $h;
2346 glVertex $w, $h;
2347 glVertex $w, 0;
2348 glEnd;
2349
2350 glColor 0, 0, 0;
2351 glBegin GL_LINE_LOOP;
2352 glVertex 0 , 0;
2353 glVertex 0 , $h;
2354 glVertex $w, $h;
2355 glVertex $w, 0;
2356 glEnd;
2357
2358 glPopMatrix;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw;
2362}
2363
2364#############################################################################
2365
2366package CFClient::UI::Face;
2367
2368our @ISA = CFClient::UI::Base::;
2369
2370use CFClient::OpenGL;
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 aspect => 1,
2377 @_,
2378 )
2379}
2380
2381sub size_request {
2382 (32, 8)
2383}
2384
2385sub draw {
2386 my ($self) = @_;
2387
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389
2390 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 }
2400}
2401
2402#############################################################################
2403
2088package CFClient::UI::Root; 2404package CFClient::UI::Root;
2089 2405
2090our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
2091 2407
2092use CFClient::OpenGL; 2408use CFClient::OpenGL;
2093 2409
2094sub check_size { 2410sub check_size {
2095 my ($self) = @_; 2411 my ($self) = @_;
2096 2412
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2098} 2414}
2099 2415
2100sub size_request { 2416sub size_request {
2101 ($::WIDTH, $::HEIGHT) 2417 ($::WIDTH, $::HEIGHT)
2102} 2418}
… …
2104sub configure { 2420sub configure {
2105 my ($self, $x, $y, $w, $h) = @_; 2421 my ($self, $x, $y, $w, $h) = @_;
2106 2422
2107 $self->SUPER::configure ($x, $y, $w, $h); 2423 $self->SUPER::configure ($x, $y, $w, $h);
2108 2424
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2110 for @{$self->{children}}; 2425 for my $child (@{$self->{children}}) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H);
2431 }
2111} 2432}
2112 2433
2113sub _topleft { 2434sub _topleft {
2114 my ($self, $x, $y) = @_; 2435 my ($self, $x, $y) = @_;
2115 2436
… …
2162############################################################################# 2483#############################################################################
2163 2484
2164package CFClient::UI; 2485package CFClient::UI;
2165 2486
2166$ROOT = new CFClient::UI::Root; 2487$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip;
2167 2489
21681 24901
2169 2491

Diff Legend

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