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.172 by root, Tue Apr 25 09:52:04 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
244sub set_max_size {
245 my ($self, $w, $h) = @_;
246
247 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h;
249}
250
182# return top left coordinates 251# return top left coordinates
183sub _topleft { 252sub _topleft {
184 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
185 257
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 259}
188 260
189# translate global coordinates to local coordinate system 261# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 339 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 340 glVertex $x , $y + $self->{h};
269 glEnd; 341 glEnd;
270 glDisable GL_BLEND; 342 glDisable GL_BLEND;
271 } 343 }
344
345 if ($ENV{PCLIENT_DEBUG}) {
346 glPushMatrix;
347 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0;
351 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h};
354 glEnd;
355 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 }
272} 358}
273 359
274sub _draw { 360sub _draw {
275 my ($self) = @_; 361 my ($self) = @_;
276 362
277 warn "no draw defined for $self\n"; 363 warn "no draw defined for $self\n";
278} 364}
279 365
280sub find_widget { 366sub find_widget {
281 my ($self, $x, $y) = @_; 367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
282 370
283 return $self 371 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 374
… …
294} 382}
295 383
296sub check_size { 384sub check_size {
297 my ($self) = @_; 385 my ($self) = @_;
298 386
299 my ($w, $h) = $self->size_request; 387 $self->{parent}
388 or return 1;
300 389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 395 $self->{req_w} = $w;
303 $self->{req_h} = $h; 396 $self->{req_h} = $h;
304 397
305 $self->{parent}->check_size 398 $self->{parent}->check_size
306 if $self->{parent}; 399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
307 } 407 }
308} 408}
309 409
310sub update { 410sub update {
311 my ($self) = @_; 411 my ($self) = @_;
… …
321} 421}
322 422
323sub emit { 423sub emit {
324 my ($self, $signal, @args) = @_; 424 my ($self, $signal, @args) = @_;
325 425
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 427}
330 428
331sub DESTROY { 429sub DESTROY {
332 my ($self) = @_; 430 my ($self) = @_;
333 431
… …
378 476
379package CFClient::UI::Empty; 477package CFClient::UI::Empty;
380 478
381our @ISA = CFClient::UI::Base::; 479our @ISA = CFClient::UI::Base::;
382 480
481sub new {
482 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg);
484}
485
383sub size_request { 486sub size_request {
384 (0, 0) 487 (0, 0)
385} 488}
386 489
387sub draw { } 490sub draw { }
… …
395sub new { 498sub new {
396 my ($class, %arg) = @_; 499 my ($class, %arg) = @_;
397 500
398 my $children = delete $arg{children} || []; 501 my $children = delete $arg{children} || [];
399 502
400 my $self = $class->SUPER::new (children => [], %arg); 503 my $self = $class->SUPER::new (
504 children => [],
505 can_events => 0,
506 %arg,
507 );
401 $self->add ($_) for @$children; 508 $self->add ($_) for @$children;
402 509
403 $self 510 $self
404} 511}
405 512
… …
416 ]; 523 ];
417 524
418 $child->check_size; 525 $child->check_size;
419} 526}
420 527
528sub children {
529 @{ $_[0]{children} }
530}
531
421sub remove { 532sub remove {
422 my ($self, $child) = @_; 533 my ($self, $child) = @_;
423 534
424 delete $child->{parent}; 535 delete $child->{parent};
536 $child->hide;
425 537
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 539
428 $self->check_size; 540 $self->check_size;
541 $self->update;
542}
543
544sub clear {
545 my ($self) = @_;
546
547 my $children = delete $self->{children};
548 $self->{children} = [];
549
550 for (@$children) {
551 delete $_->{parent};
552 $_->hide;
553 }
429} 554}
430 555
431sub find_widget { 556sub find_widget {
432 my ($self, $x, $y) = @_; 557 my ($self, $x, $y) = @_;
433 558
… …
561sub new { die } 686sub new { die }
562 687
563sub size_request { 688sub size_request {
564 my ($self) = @_; 689 my ($self) = @_;
565 690
566 @$self{qw(child_w child_h)} = $self->child->size_request; 691 @$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)}); 692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 693
569 @$self{qw(child_w child_h)} 694 @$self{qw(child_w child_h)}
570} 695}
571 696
… …
593 border => 0.8, 718 border => 0.8,
594 @_ 719 @_
595 ); 720 );
596 721
597 $self 722 $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} 723}
618 724
619sub _draw { 725sub _draw {
620 my ($self) = @_; 726 my ($self) = @_;
621 727
… …
656 my $class = shift; 762 my $class = shift;
657 763
658 # TODO: user_x, user_y, overwrite moveto? 764 # TODO: user_x, user_y, overwrite moveto?
659 765
660 my $self = $class->SUPER::new ( 766 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 767 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 768 border_bg => [1, 1, 1, 1],
663 border => 0.8, 769 border => 0.8,
770 can_events => 1,
664 @_ 771 @_
665 ); 772 );
666 773
667 $self->{title} &&= new CFClient::UI::Label 774 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 775 align => 0,
… …
678} 785}
679 786
680sub size_request { 787sub size_request {
681 my ($self) = @_; 788 my ($self) = @_;
682 789
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684
685 my ($w, $h) = $self->SUPER::size_request; 790 my ($w, $h) = $self->SUPER::size_request;
686 791
687 ( 792 (
688 $w + $self->border * 2, 793 $w + $self->border * 2,
689 $h + $self->border * 2, 794 $h + $self->border * 2,
… …
817 $self->{children}[$y][$x] = $child; 922 $self->{children}[$y][$x] = $child;
818 923
819 $child->check_size; 924 $child->check_size;
820} 925}
821 926
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
822# TODO: move to container class maybe? send childs a signal on removal? 931# TODO: move to container class maybe? send childs a signal on removal?
823sub clear { 932sub clear {
824 my ($self) = @_; 933 my ($self) = @_;
825 934
935 my @children = $self->children;
826 delete $self->{children}; 936 delete $self->{children};
937
938 for (@children) {
939 delete $_->{parent};
940 $_->hide;
941 }
942
827 $self->update; 943 $self->update;
828} 944}
829 945
830sub get_wh { 946sub get_wh {
831 my ($self) = @_; 947 my ($self) = @_;
… …
837 or next; 953 or next;
838 954
839 for my $x (0 .. $#$row) { 955 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 956 my $widget = $row->[$x]
841 or next; 957 or next;
842 my ($w, $h) = $widget->size_request; 958 my ($w, $h) = @$widget{qw(req_w req_h)};
843 959
844 $w[$x] = max $w[$x], $w; 960 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 961 $h[$y] = max $h[$y], $h;
846 } 962 }
847 } 963 }
… …
952 1068
953 ($h, $w) = ($w, $h); 1069 ($h, $w) = ($w, $h);
954 1070
955 my $children = $self->{children}; 1071 my $children = $self->{children};
956 1072
957 my @h = map +($_->size_request)[0], @$children; 1073 my @h = map $_->{req_w}, @$children;
958 1074
959 my $req_h = List::Util::sum @h; 1075 my $req_h = List::Util::sum @h;
960 1076
961 if ($req_h > $h) { 1077 if ($req_h > $h) {
962 # ah well, not enough space 1078 # ah well, not enough space
… …
1010sub size_allocate { 1126sub size_allocate {
1011 my ($self, $w, $h) = @_; 1127 my ($self, $w, $h) = @_;
1012 1128
1013 my $children = $self->{children}; 1129 my $children = $self->{children};
1014 1130
1015 my @h = map +($_->size_request)[1], @$children; 1131 my @h = map $_->{req_h}, @$children;
1016 1132
1017 my $req_h = List::Util::sum @h; 1133 my $req_h = List::Util::sum @h;
1018 1134
1019 if ($req_h > $h) { 1135 if ($req_h > $h) {
1020 # ah well, not enough space 1136 # ah well, not enough space
… …
1054 1170
1055sub new { 1171sub new {
1056 my ($class, %arg) = @_; 1172 my ($class, %arg) = @_;
1057 1173
1058 my $self = $class->SUPER::new ( 1174 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1175 fg => [1, 1, 1],
1176 #font => default_font
1060 fontsize => 1, 1177 fontsize => 1,
1061 text => "", 1178 text => "",
1062 align => -1, 1179 align => -1,
1063 valign => -1, 1180 valign => -1,
1064 padding => 2, 1181 padding => 2,
1065 layout => new CFClient::Layout, 1182 layout => new CFClient::Layout,
1183 can_events => 0,
1066 %arg 1184 %arg
1067 ); 1185 );
1068 1186
1069 if (exists $self->{template}) { 1187 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1188 my $layout = new CFClient::Layout;
… …
1076 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1077 1195
1078 $self 1196 $self
1079} 1197}
1080 1198
1081sub escape_text { 1199sub escape {
1082 local $_ = $_[1]; 1200 local $_ = $_[1];
1083 1201
1084 s/&/&amp;/g; 1202 s/&/&amp;/g;
1085 s/>/&gt;/g; 1203 s/>/&gt;/g;
1086 s/</&lt;/g; 1204 s/</&lt;/g;
… …
1092 my ($self, $text) = @_; 1210 my ($self, $text) = @_;
1093 1211
1094 $self->{layout}->set_text ($text); 1212 $self->{layout}->set_text ($text);
1095 1213
1096 delete $self->{texture}; 1214 delete $self->{texture};
1215 $self->check_size;
1097 $self->update; 1216 $self->update;
1098} 1217}
1099 1218
1100sub set_markup { 1219sub set_markup {
1101 my ($self, $markup) = @_; 1220 my ($self, $markup) = @_;
1102 1221
1103 $self->{layout}->set_markup ($markup); 1222 $self->{layout}->set_markup ($markup);
1104 1223
1105 delete $self->{texture}; 1224 delete $self->{texture};
1225 $self->check_size;
1106 $self->update; 1226 $self->update;
1107} 1227}
1108 1228
1109sub size_request { 1229sub size_request {
1110 my ($self) = @_; 1230 my ($self) = @_;
1111 1231
1112 $self->{layout}->set_width; 1232 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1);
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1235
1115 my ($w, $h) = $self->{layout}->size; 1236 my ($w, $h) = $self->{layout}->size;
1116 1237
1117 if (exists $self->{template}) { 1238 if (exists $self->{template}) {
1239 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1240 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1241
1120 my ($w2, $h2) = $self->{template}->size; 1242 my ($w2, $h2) = $self->{template}->size;
1121 1243
1122 $w = List::Util::max $w, $w2; 1244 $w = List::Util::max $w, $w2;
… …
1137 1259
1138sub set_fontsize { 1260sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1261 my ($self, $fontsize) = @_;
1140 1262
1141 $self->{fontsize} = $fontsize; 1263 $self->{fontsize} = $fontsize;
1264 delete $self->{texture};
1142 $self->check_size; 1265 $self->check_size;
1266 $self->update;
1143} 1267}
1144 1268
1145sub _draw { 1269sub _draw {
1146 my ($self) = @_; 1270 my ($self) = @_;
1147 1271
1148 my $tex = $self->{texture} ||= do { 1272 my $tex = $self->{texture} ||= do {
1273 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $self->{layout}->set_width ($self->{w}); 1274 $self->{layout}->set_width ($self->{w});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1151 new_from_layout CFClient::Texture $self->{layout} 1276 new_from_layout CFClient::Texture $self->{layout}
1152 }; 1277 };
1153 1278
… …
1186 1311
1187sub new { 1312sub new {
1188 my $class = shift; 1313 my $class = shift;
1189 1314
1190 $class->SUPER::new ( 1315 $class->SUPER::new (
1191 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1317 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1318 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1319 active_fg => [0, 0, 0],
1195 can_hover => 1, 1320 can_hover => 1,
1196 can_focus => 1, 1321 can_focus => 1,
1197 valign => 0, 1322 valign => 0,
1323 can_events => 1,
1198 @_ 1324 @_
1199 ) 1325 )
1200} 1326}
1201 1327
1202sub _set_text { 1328sub _set_text {
… …
1230} 1356}
1231 1357
1232sub size_allocate { 1358sub size_allocate {
1233 my ($self, $w, $h) = @_; 1359 my ($self, $w, $h) = @_;
1234 1360
1235 $self->_set_text ($self->{text}); 1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236} 1362}
1237 1363
1238sub set_text { 1364sub set_text {
1239 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1240 1366
… …
1355 my ($self, $ev) = @_; 1481 my ($self, $ev) = @_;
1356 1482
1357 my $sym = $ev->{sym}; 1483 my $sym = $ev->{sym};
1358 1484
1359 if ($sym == 13) { 1485 if ($sym == 13) {
1486 unshift @{$self->{history}},
1487 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1490 $self->emit (activate => $txt);
1361 $self->update; 1491 $self->update;
1492
1493 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text;
1496 }
1497 if (@{$self->{history} || []} > 0) {
1498 $self->{history_pointer}++;
1499 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1500 $self->{history_pointer} = @{$self->{history} || []} - 1;
1501 }
1502 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1503 }
1504
1505 } elsif ($sym == CFClient::SDLK_DOWN) {
1506 $self->{history_pointer}--;
1507 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1508
1509 if ($self->{history_pointer} >= 0) {
1510 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1511 } else {
1512 $self->set_text ($self->{history_saveback});
1513 }
1362 1514
1363 } else { 1515 } else {
1364 $self->SUPER::key_down ($ev); 1516 $self->SUPER::key_down ($ev);
1365 } 1517 }
1366 1518
… …
1380 1532
1381sub new { 1533sub new {
1382 my $class = shift; 1534 my $class = shift;
1383 1535
1384 $class->SUPER::new ( 1536 $class->SUPER::new (
1385 padding => 4, 1537 padding => 4,
1386 fg => [1, 1, 1], 1538 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2], 1539 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1540 active_fg => [0, 0, 1],
1389 can_hover => 1, 1541 can_hover => 1,
1390 align => 0, 1542 align => 0,
1391 valign => 0, 1543 valign => 0,
1544 can_events => 1,
1392 @_ 1545 @_
1393 ) 1546 )
1394} 1547}
1395 1548
1396sub button_up { 1549sub button_up {
… …
1501our %loaded_images; 1654our %loaded_images;
1502 1655
1503sub new { 1656sub new {
1504 my $class = shift; 1657 my $class = shift;
1505 1658
1506 my $self = $class->SUPER::new (@_); 1659 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1660
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1661 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1662
1510 $loaded_images{$self->{image}} ||= 1663 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1664 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1553############################################################################# 1706#############################################################################
1554 1707
1555package CFClient::UI::VGauge; 1708package CFClient::UI::VGauge;
1556 1709
1557our @ISA = CFClient::UI::Base::; 1710our @ISA = CFClient::UI::Base::;
1711
1712use List::Util qw(min max);
1558 1713
1559use CFClient::OpenGL; 1714use CFClient::OpenGL;
1560 1715
1561my %tex = ( 1716my %tex = (
1562 food => [ 1717 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1719 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1720 ],
1566 grace => [ 1721 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1722 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1723 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1724 ],
1570 hp => [ 1725 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1726 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1727 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1728 ],
1574 mana => [ 1729 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1730 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1731 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1732 ],
1578); 1733);
1579 1734
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 1735# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 1736sub new {
… …
1619 1774
1620sub _draw { 1775sub _draw {
1621 my ($self) = @_; 1776 my ($self) = @_;
1622 1777
1623 my $tex = $tex{$self->{type}}; 1778 my $tex = $tex{$self->{type}};
1779 my ($t1, $t2, $t3) = @$tex;
1624 1780
1625 my ($w, $h) = ($self->{w}, $self->{h}); 1781 my ($w, $h) = ($self->{w}, $self->{h});
1626 1782
1627 if ($self->{vertical}) { 1783 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 1784 glRotate 90, 0, 0, 1;
… …
1630 1786
1631 ($w, $h) = ($h, $w); 1787 ($w, $h) = ($h, $w);
1632 } 1788 }
1633 1789
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 1790 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 1791
1637 my $t1 = $tex->[0]; 1792 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 1793 my $ycut2 = max 0, min 1, $ycut - 1;
1794
1795 my $h1 = $self->{h} * (1 - $ycut1);
1796 my $h2 = $self->{h} * (1 - $ycut2);
1639 1797
1640 glEnable GL_BLEND; 1798 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 1800 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 1802
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1803 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 1804 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 1805 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1806 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1807 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1808 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 1809 glEnd;
1655 1810
1811 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1812 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1814 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1815 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1816 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1817 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 1818 glEnd;
1819
1820 if ($t3) {
1821 glBindTexture GL_TEXTURE_2D, $t3->{name};
1822 glBegin GL_QUADS;
1823 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1824 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1825 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1826 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1827 glEnd;
1828 }
1663 1829
1664 glDisable GL_BLEND; 1830 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 1831 glDisable GL_TEXTURE_2D;
1666} 1832}
1667 1833
… …
1670package CFClient::UI::Gauge; 1836package CFClient::UI::Gauge;
1671 1837
1672our @ISA = CFClient::UI::VBox::; 1838our @ISA = CFClient::UI::VBox::;
1673 1839
1674sub new { 1840sub new {
1675 my ($class, %arg) = shift; 1841 my ($class, %arg) = @_;
1676 1842
1677 my $self = $class->SUPER::new ( 1843 my $self = $class->SUPER::new (
1678 @_, 1844 tooltip => $arg{type},
1845 can_hover => 1,
1846 can_events => 1,
1847 %arg,
1679 ); 1848 );
1680 1849
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1850 $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); 1851 $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"); 1852 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 1853
1685 $self 1854 $self
1686} 1855}
1687 1856
1688sub set_fontsize { 1857sub set_fontsize {
… …
1854 2023
1855sub new { 2024sub new {
1856 my $class = shift; 2025 my $class = shift;
1857 2026
1858 my $self = $class->SUPER::new ( 2027 my $self = $class->SUPER::new (
1859 fontsize => 1, 2028 fontsize => 1,
2029 can_events => 0,
2030 #font => default_font
1860 @_, 2031 @_,
1861 2032
1862 layout => (new CFClient::Layout), 2033 layout => (new CFClient::Layout),
1863 par => [], 2034 par => [],
1864 height => 0, 2035 height => 0,
1865 children => [ 2036 children => [
1866 (new CFClient::UI::Empty expand => 1), 2037 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2038 (new CFClient::UI::Slider vertical => 1),
1868 ], 2039 ],
1869 ); 2040 );
1870 2041
… …
1904sub size_allocate { 2075sub size_allocate {
1905 my ($self, $w, $h) = @_; 2076 my ($self, $w, $h) = @_;
1906 2077
1907 $self->SUPER::size_allocate ($w, $h); 2078 $self->SUPER::size_allocate ($w, $h);
1908 2079
2080 $self->{layout}->set_font ($self->{font}) if $self->{font};
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2081 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910 $self->{layout}->set_width ($self->{children}[0]{w}); 2082 $self->{layout}->set_width ($self->{children}[0]{w});
1911 2083
1912 $self->reflow; 2084 $self->reflow;
1913} 2085}
… …
1966 2138
1967 my $y = 0; 2139 my $y = 0;
1968 2140
1969 my $layout = $self->{layout}; 2141 my $layout = $self->{layout};
1970 2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144
1971 for my $par (@{$self->{par}}) { 2145 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2146 my $h = $par->[0];
1973 2147
1974 if ($y0 < $y + $h && $y < $y1) { 2148 if ($y0 < $y + $h && $y < $y1) {
1975 $layout->set_text ($par->[2]); 2149 $layout->set_text ($par->[2]);
… …
1992 my ($self) = @_; 2166 my ($self) = @_;
1993 2167
1994 if ($self->{texture}) { 2168 if ($self->{texture}) {
1995 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1;
1997 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1998 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
1999 } 2174 }
2000 2175
2001 $self->{children}[1]->draw; 2176 $self->{children}[1]->draw;
… …
2052 2227
2053sub new { 2228sub new {
2054 my $class = shift; 2229 my $class = shift;
2055 2230
2056 my $self = $class->SUPER::new ( 2231 my $self = $class->SUPER::new (
2057 state => 0, 2232 state => 0,
2058 connect_activate => \&toggle_flopper, 2233 connect_activate => \&toggle_flopper,
2059 @_ 2234 @_
2060 ); 2235 );
2061 2236
2062 if ($self->{state}) { 2237 if ($self->{state}) {
… …
2083 $self->emit (changed => $self->{state}); 2258 $self->emit (changed => $self->{state});
2084} 2259}
2085 2260
2086############################################################################# 2261#############################################################################
2087 2262
2263package CFClient::UI::Tooltip;
2264
2265our @ISA = CFClient::UI::Bin::;
2266
2267use CFClient::OpenGL;
2268
2269sub new {
2270 my $class = shift;
2271
2272 $class->SUPER::new (
2273 @_,
2274 can_events => 0,
2275 )
2276}
2277
2278sub set_markup {
2279 my ($self, $text) = @_;
2280
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2282 $self->{label}->set_markup ($text);
2283 $self->add ($self->{label});
2284}
2285
2286sub size_request {
2287 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292
2293 ($w + 4, $h + 4)
2294}
2295
2296sub size_allocate {
2297 my ($self, $w, $h) = @_;
2298
2299 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375;
2307
2308 my ($w, $h) = @$self{qw(w h)};
2309
2310 glColor 1, 0.8, 0.4;
2311 glBegin GL_QUADS;
2312 glVertex 0 , 0;
2313 glVertex 0 , $h;
2314 glVertex $w, $h;
2315 glVertex $w, 0;
2316 glEnd;
2317
2318 glColor 0, 0, 0;
2319 glBegin GL_LINE_LOOP;
2320 glVertex 0 , 0;
2321 glVertex 0 , $h;
2322 glVertex $w, $h;
2323 glVertex $w, 0;
2324 glEnd;
2325
2326 glPopMatrix;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw;
2330}
2331
2332#############################################################################
2333
2334package CFClient::UI::Face;
2335
2336our @ISA = CFClient::UI::Base::;
2337
2338use CFClient::OpenGL;
2339
2340sub new {
2341 my $class = shift;
2342
2343 $class->SUPER::new (
2344 aspect => 1,
2345 @_,
2346 )
2347}
2348
2349sub size_request {
2350 (32, 8)
2351}
2352
2353sub draw {
2354 my ($self) = @_;
2355
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357
2358 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 }
2368}
2369
2370#############################################################################
2371
2088package CFClient::UI::Root; 2372package CFClient::UI::Root;
2089 2373
2090our @ISA = CFClient::UI::Container::; 2374our @ISA = CFClient::UI::Container::;
2091 2375
2092use CFClient::OpenGL; 2376use CFClient::OpenGL;
2093 2377
2094sub check_size { 2378sub check_size {
2095 my ($self) = @_; 2379 my ($self) = @_;
2096 2380
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2098} 2382}
2099 2383
2100sub size_request { 2384sub size_request {
2101 ($::WIDTH, $::HEIGHT) 2385 ($::WIDTH, $::HEIGHT)
2102} 2386}
… …
2104sub configure { 2388sub configure {
2105 my ($self, $x, $y, $w, $h) = @_; 2389 my ($self, $x, $y, $w, $h) = @_;
2106 2390
2107 $self->SUPER::configure ($x, $y, $w, $h); 2391 $self->SUPER::configure ($x, $y, $w, $h);
2108 2392
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2110 for @{$self->{children}}; 2393 for my $child (@{$self->{children}}) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398 $child->configure ($X, $Y, $W,$H);
2399 }
2111} 2400}
2112 2401
2113sub _topleft { 2402sub _topleft {
2114 my ($self, $x, $y) = @_; 2403 my ($self, $x, $y) = @_;
2115 2404
… …
2162############################################################################# 2451#############################################################################
2163 2452
2164package CFClient::UI; 2453package CFClient::UI;
2165 2454
2166$ROOT = new CFClient::UI::Root; 2455$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip;
2167 2457
21681 24581
2169 2459

Diff Legend

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