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.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 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
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
23 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
25 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
26 } 39 }
27 40
28 return; 41 return;
29 } 42 }
30 } 43 }
… …
34 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
35} 48}
36 49
37# class methods for events 50# class methods for events
38sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
40} 54}
41 55
42sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
44} 59}
45 60
46sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
47 my ($ev) = @_; 62 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 71 check_tooltip;
57 } 72 }
58 73
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 75
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
62} 80}
63 81
64sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
67 85
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 87
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 89
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
73 94
74 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 97 $grab->update if $grab;
77 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 115
95 check_tooltip; 116 check_tooltip;
96 } 117 }
97 118
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
99} 123}
100 124
101# convert position array to integers 125# convert position array to integers
102sub harmonize { 126sub harmonize {
103 my ($vals) = @_; 127 my ($vals) = @_;
… …
121 145
122sub new { 146sub new {
123 my $class = shift; 147 my $class = shift;
124 148
125 my $self = bless { 149 my $self = bless {
126 x => 0, 150 x => 0,
127 y => 0, 151 y => 0,
128 z => 0, 152 z => 0,
129 can_events => 1, 153 can_events => 1,
130 @_ 154 @_
131 }, $class; 155 }, $class;
132 156
133 for (keys %$self) { 157 for (keys %$self) {
… …
137 } 161 }
138 162
139 $self 163 $self
140} 164}
141 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
142sub show { 173sub show {
143 my ($self) = @_; 174 my ($self) = @_;
144 175
145 return if $self->{parent}; 176 return if $self->{parent};
146 177
… …
148} 179}
149 180
150sub hide { 181sub hide {
151 my ($self) = @_; 182 my ($self) = @_;
152 183
153 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
154 186
155 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
156} 189}
157 190
158sub move { 191sub move {
159 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
160 193
… …
163 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
164 197
165 $self->update; 198 $self->update;
166} 199}
167 200
168sub needs_redraw { 201sub set_size {
169 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
170} 208}
171 209
172sub size_request { 210sub size_request {
173 require Carp; 211 require Carp;
174 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
206 244
207sub size_allocate { 245sub size_allocate {
208 # nothing to be done 246 # nothing to be done
209} 247}
210 248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
263 my ($self, $w, $h) = @_;
264
265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
211# return top left coordinates 269# return top left coordinates
212sub _topleft { 270sub _topleft {
213 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
214 275
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
216} 277}
217 278
218# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
298 glEnd; 359 glEnd;
299 glDisable GL_BLEND; 360 glDisable GL_BLEND;
300 } 361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0;
369 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h};
372 glEnd;
373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
301} 376}
302 377
303sub _draw { 378sub _draw {
304 my ($self) = @_; 379 my ($self) = @_;
305 380
… …
325} 400}
326 401
327sub check_size { 402sub check_size {
328 my ($self) = @_; 403 my ($self) = @_;
329 404
330 return unless $self->{parent}; 405 $self->{parent}
406 or return 1;
331 407
332 my ($w, $h) = $self->size_request; 408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
333 411
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 413 $self->{req_w} = $w;
336 $self->{req_h} = $h; 414 $self->{req_h} = $h;
337 415
338 $self->{parent}->check_size; 416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
339 } 425 }
340} 426}
341 427
342sub update { 428sub update {
343 my ($self) = @_; 429 my ($self) = @_;
… …
353} 439}
354 440
355sub emit { 441sub emit {
356 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
357 443
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 445}
362 446
363sub DESTROY { 447sub DESTROY {
364 my ($self) = @_; 448 my ($self) = @_;
365 449
… …
432sub new { 516sub new {
433 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
434 518
435 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
436 520
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
438 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
439 527
440 $self 528 $self
441} 529}
442 530
… …
453 ]; 541 ];
454 542
455 $child->check_size; 543 $child->check_size;
456} 544}
457 545
546sub children {
547 @{ $_[0]{children} }
548}
549
458sub remove { 550sub remove {
459 my ($self, $child) = @_; 551 my ($self, $child) = @_;
460 552
461 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
462 555
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464 557
465 $self->check_size; 558 $self->check_size;
466 $self->update; 559 $self->update;
560}
561
562sub clear {
563 my ($self) = @_;
564
565 my $children = delete $self->{children};
566 $self->{children} = [];
567
568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
467} 572}
468 573
469sub find_widget { 574sub find_widget {
470 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
471 576
… …
546} 651}
547 652
548sub update { 653sub update {
549 my ($self) = @_; 654 my ($self) = @_;
550 655
551 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 657 $self->SUPER::update;
554} 658}
555 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
556sub render_chld { 667sub render_child {
557 my ($self) = @_; 668 my ($self) = @_;
558 669
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
561 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw; 673 $self->child->draw;
674# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
563 }; 681 };
564}
565
566sub size_allocate {
567 my ($self, $w, $h) = @_;
568
569 $self->child->configure (0, 0, $w, $h);
570
571 $self->render_chld;
572} 682}
573 683
574sub _draw { 684sub _draw {
575 my ($self) = @_; 685 my ($self) = @_;
576 686
… …
578 688
579 my $tex = $self->{texture} 689 my $tex = $self->{texture}
580 or return; 690 or return;
581 691
582 glEnable GL_BLEND; 692 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
585 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
586 697
587 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
588 699
589 glDisable GL_BLEND; 700 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
631 border => 0.8, 742 border => 0.8,
632 @_ 743 @_
633 ); 744 );
634 745
635 $self 746 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655} 747}
656 748
657sub _draw { 749sub _draw {
658 my ($self) = @_; 750 my ($self) = @_;
659 751
… …
694 my $class = shift; 786 my $class = shift;
695 787
696 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
697 789
698 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
701 border => 0.8, 793 border => 0.8,
702 can_events => 1, 794 can_events => 1,
703 @_ 795 @_
704 ); 796 );
705 797
706 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
… …
717} 809}
718 810
719sub size_request { 811sub size_request {
720 my ($self) = @_; 812 my ($self) = @_;
721 813
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
725 815
726 ( 816 (
727 $w + $self->border * 2, 817 $w + $self->border * 2,
728 $h + $self->border * 2, 818 $h + $self->border * 2,
… …
856 $self->{children}[$y][$x] = $child; 946 $self->{children}[$y][$x] = $child;
857 947
858 $child->check_size; 948 $child->check_size;
859} 949}
860 950
951sub children {
952 grep $_, map @$_, grep $_, @{ $_[0]{children} }
953}
954
861# TODO: move to container class maybe? send childs a signal on removal? 955# TODO: move to container class maybe? send childs a signal on removal?
862sub clear { 956sub clear {
863 my ($self) = @_; 957 my ($self) = @_;
864 958
959 my @children = $self->children;
865 delete $self->{children}; 960 delete $self->{children};
961
962 for (@children) {
963 delete $_->{parent};
964 $_->hide;
965 }
966
866 $self->update; 967 $self->update;
867} 968}
868 969
869sub get_wh { 970sub get_wh {
870 my ($self) = @_; 971 my ($self) = @_;
… …
1093 1194
1094sub new { 1195sub new {
1095 my ($class, %arg) = @_; 1196 my ($class, %arg) = @_;
1096 1197
1097 my $self = $class->SUPER::new ( 1198 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1199 fg => [1, 1, 1],
1200 #font => default_font
1099 fontsize => 1, 1201 fontsize => 1,
1100 text => "", 1202 text => "",
1101 align => -1, 1203 align => -1,
1102 valign => -1, 1204 valign => -1,
1103 padding => 2, 1205 padding => 2,
1104 layout => new CFClient::Layout, 1206 layout => new CFClient::Layout,
1105 can_events => 0, 1207 can_events => 0,
1106 %arg 1208 %arg
1107 ); 1209 );
1108 1210
1109 if (exists $self->{template}) { 1211 if (exists $self->{template}) {
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1218 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1219
1118 $self 1220 $self
1119} 1221}
1120 1222
1121sub escape_text { 1223sub escape {
1122 local $_ = $_[1]; 1224 local $_ = $_[1];
1123 1225
1124 s/&/&amp;/g; 1226 s/&/&amp;/g;
1125 s/>/&gt;/g; 1227 s/>/&gt;/g;
1126 s/</&lt;/g; 1228 s/</&lt;/g;
1127 1229
1128 $_[1] 1230 $_[1]
1129} 1231}
1130 1232
1233sub update {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237 $self->SUPER::update;
1238}
1239
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1131sub set_text { 1246sub set_text {
1132 my ($self, $text) = @_; 1247 my ($self, $text) = @_;
1133 1248
1249 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text";
1251
1134 $self->{layout}->set_text ($text); 1252 $self->{layout}->set_text ($text);
1135 1253
1136 delete $self->{texture}; 1254 delete $self->{texture};
1255 $self->update;
1137 $self->check_size; 1256 $self->check_size;
1138 $self->update;
1139} 1257}
1140 1258
1141sub set_markup { 1259sub set_markup {
1142 my ($self, $markup) = @_; 1260 my ($self, $markup) = @_;
1143 1261
1262 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup";
1264
1144 $self->{layout}->set_markup ($markup); 1265 $self->{layout}->set_markup ($markup);
1145 1266
1146 delete $self->{texture}; 1267 delete $self->{texture};
1268 $self->update;
1147 $self->check_size; 1269 $self->check_size;
1148 $self->update;
1149} 1270}
1150 1271
1151sub size_request { 1272sub size_request {
1152 my ($self) = @_; 1273 my ($self) = @_;
1153 1274
1154 $self->{layout}->set_width; 1275 $self->{layout}->set_font ($self->{font}) if $self->{font};
1276 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1277 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1278
1157 my ($w, $h) = $self->{layout}->size; 1279 my ($w, $h) = $self->{layout}->size;
1158 1280
1159 if (exists $self->{template}) { 1281 if (exists $self->{template}) {
1282 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1283 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1284
1162 my ($w2, $h2) = $self->{template}->size; 1285 my ($w2, $h2) = $self->{template}->size;
1163 1286
1164 $w = List::Util::max $w, $w2; 1287 $w = List::Util::max $w, $w2;
… …
1179 1302
1180sub set_fontsize { 1303sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1304 my ($self, $fontsize) = @_;
1182 1305
1183 $self->{fontsize} = $fontsize; 1306 $self->{fontsize} = $fontsize;
1307 delete $self->{texture};
1184 $self->check_size; 1308 $self->check_size;
1309 $self->update;
1185} 1310}
1186 1311
1187sub _draw { 1312sub _draw {
1188 my ($self) = @_; 1313 my ($self) = @_;
1189 1314
1190 my $tex = $self->{texture} ||= do { 1315 my $tex = $self->{texture} ||= do {
1316 $self->{layout}->set_font ($self->{font}) if $self->{font};
1191 $self->{layout}->set_width ($self->{w}); 1317 $self->{layout}->set_width ($self->{w});
1192 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1318 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1193 new_from_layout CFClient::Texture $self->{layout} 1319 new_from_layout CFClient::Texture $self->{layout}
1194 }; 1320 };
1195 1321
… …
1228 1354
1229sub new { 1355sub new {
1230 my $class = shift; 1356 my $class = shift;
1231 1357
1232 $class->SUPER::new ( 1358 $class->SUPER::new (
1233 fg => [1, 1, 1], 1359 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1360 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1361 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1362 active_fg => [0, 0, 0],
1237 can_hover => 1, 1363 can_hover => 1,
1238 can_focus => 1, 1364 can_focus => 1,
1239 valign => 0, 1365 valign => 0,
1240 can_events => 1, 1366 can_events => 1,
1241 @_ 1367 @_
1242 ) 1368 )
1243} 1369}
1244 1370
… …
1398 my ($self, $ev) = @_; 1524 my ($self, $ev) = @_;
1399 1525
1400 my $sym = $ev->{sym}; 1526 my $sym = $ev->{sym};
1401 1527
1402 if ($sym == 13) { 1528 if ($sym == 13) {
1529 unshift @{$self->{history}},
1530 my $txt = $self->get_text;
1531 $self->{history_pointer} = -1;
1532 $self->{history_saveback} = '';
1403 $self->emit (activate => $self->get_text); 1533 $self->emit (activate => $txt);
1404 $self->update; 1534 $self->update;
1535
1536 } elsif ($sym == CFClient::SDLK_UP) {
1537 if ($self->{history_pointer} < 0) {
1538 $self->{history_saveback} = $self->get_text;
1539 }
1540 if (@{$self->{history} || []} > 0) {
1541 $self->{history_pointer}++;
1542 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1543 $self->{history_pointer} = @{$self->{history} || []} - 1;
1544 }
1545 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1546 }
1547
1548 } elsif ($sym == CFClient::SDLK_DOWN) {
1549 $self->{history_pointer}--;
1550 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1551
1552 if ($self->{history_pointer} >= 0) {
1553 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1554 } else {
1555 $self->set_text ($self->{history_saveback});
1556 }
1405 1557
1406 } else { 1558 } else {
1407 $self->SUPER::key_down ($ev); 1559 $self->SUPER::key_down ($ev);
1408 } 1560 }
1409 1561
… …
1423 1575
1424sub new { 1576sub new {
1425 my $class = shift; 1577 my $class = shift;
1426 1578
1427 $class->SUPER::new ( 1579 $class->SUPER::new (
1428 padding => 4, 1580 padding => 4,
1429 fg => [1, 1, 1], 1581 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2], 1582 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1583 active_fg => [0, 0, 1],
1432 can_hover => 1, 1584 can_hover => 1,
1433 align => 0, 1585 align => 0,
1434 valign => 0, 1586 valign => 0,
1435 can_events => 1, 1587 can_events => 1,
1436 @_ 1588 @_
1437 ) 1589 )
1438} 1590}
1439 1591
… …
1598 1750
1599package CFClient::UI::VGauge; 1751package CFClient::UI::VGauge;
1600 1752
1601our @ISA = CFClient::UI::Base::; 1753our @ISA = CFClient::UI::Base::;
1602 1754
1755use List::Util qw(min max);
1756
1603use CFClient::OpenGL; 1757use CFClient::OpenGL;
1604 1758
1605my %tex = ( 1759my %tex = (
1606 food => [ 1760 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1761 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1762 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 1763 ],
1610 grace => [ 1764 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1765 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1766 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1613 ], 1767 ],
1614 hp => [ 1768 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1769 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1770 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 1771 ],
1618 mana => [ 1772 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1773 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1774 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1621 ], 1775 ],
1622); 1776);
1623 1777
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 1778# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 1779sub new {
… …
1644} 1798}
1645 1799
1646sub set_max { 1800sub set_max {
1647 my ($self, $max) = @_; 1801 my ($self, $max) = @_;
1648 1802
1803 return if $self->{max_val} == $max;
1804
1649 $self->{max_val} = $max; 1805 $self->{max_val} = $max;
1806 $self->update;
1650} 1807}
1651 1808
1652sub set_value { 1809sub set_value {
1653 my ($self, $val, $max) = @_; 1810 my ($self, $val, $max) = @_;
1654 1811
1655 $self->set_max ($max) 1812 $self->set_max ($max)
1656 if defined $max; 1813 if defined $max;
1657 1814
1658 $max = $self->{max_val}; 1815 return if $self->{val} == $val;
1816
1659 $self->{val} = $val; 1817 $self->{val} = $val;
1660
1661 $self->update; 1818 $self->update;
1662} 1819}
1663 1820
1664sub _draw { 1821sub _draw {
1665 my ($self) = @_; 1822 my ($self) = @_;
1666 1823
1667 my $tex = $tex{$self->{type}}; 1824 my $tex = $tex{$self->{type}};
1825 my ($t1, $t2, $t3) = @$tex;
1668 1826
1669 my ($w, $h) = ($self->{w}, $self->{h}); 1827 my ($w, $h) = ($self->{w}, $self->{h});
1670 1828
1671 if ($self->{vertical}) { 1829 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 1830 glRotate 90, 0, 0, 1;
… …
1674 1832
1675 ($w, $h) = ($h, $w); 1833 ($w, $h) = ($h, $w);
1676 } 1834 }
1677 1835
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 1836 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 1837
1681 my $t1 = $tex->[0]; 1838 my $ycut1 = max 0, min 1, $ycut;
1682 my $t2 = $tex->[1]; 1839 my $ycut2 = max 0, min 1, $ycut - 1;
1840
1841 my $h1 = $self->{h} * (1 - $ycut1);
1842 my $h2 = $self->{h} * (1 - $ycut2);
1683 1843
1684 glEnable GL_BLEND; 1844 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 1848
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1849 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 1850 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 1851 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1852 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1853 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1854 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 1855 glEnd;
1699 1856
1857 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1858 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 1859 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1860 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1861 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1862 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1863 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 glEnd; 1864 glEnd;
1865
1866 if ($t3) {
1867 glBindTexture GL_TEXTURE_2D, $t3->{name};
1868 glBegin GL_QUADS;
1869 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1870 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1871 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1872 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1873 glEnd;
1874 }
1707 1875
1708 glDisable GL_BLEND; 1876 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 1877 glDisable GL_TEXTURE_2D;
1710} 1878}
1711 1879
… …
1717 1885
1718sub new { 1886sub new {
1719 my ($class, %arg) = @_; 1887 my ($class, %arg) = @_;
1720 1888
1721 my $self = $class->SUPER::new ( 1889 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 1890 tooltip => $arg{type},
1891 can_hover => 1,
1892 can_events => 1,
1723 %arg, 1893 %arg,
1724 ); 1894 );
1725 1895
1726 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1896 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1727 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1897 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1728 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1898 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1729 1899
1730 $self 1900 $self
1731} 1901}
1732 1902
… …
1735 1905
1736 $self->{value}->set_fontsize ($fsize); 1906 $self->{value}->set_fontsize ($fsize);
1737 $self->{max} ->set_fontsize ($fsize); 1907 $self->{max} ->set_fontsize ($fsize);
1738} 1908}
1739 1909
1910sub set_max {
1911 my ($self, $max) = @_;
1912
1913 $self->{gauge}->set_max ($max);
1914 $self->{max}->set_text ($max);
1915}
1916
1740sub set_value { 1917sub set_value {
1741 my ($self, $val, $max) = @_; 1918 my ($self, $val, $max) = @_;
1742 1919
1743 $self->set_max ($max) 1920 $self->set_max ($max)
1744 if defined $max; 1921 if defined $max;
1745 1922
1746 $self->{gauge}->set_value ($val, $max); 1923 $self->{gauge}->set_value ($val, $max);
1747 $self->{value}->set_text ($val); 1924 $self->{value}->set_text ($val);
1748}
1749
1750sub set_max {
1751 my ($self, $max) = @_;
1752
1753 $self->{gauge}->set_max ($max);
1754 $self->{max}->set_text ($max);
1755} 1925}
1756 1926
1757############################################################################# 1927#############################################################################
1758 1928
1759package CFClient::UI::Slider; 1929package CFClient::UI::Slider;
… …
1899 2069
1900sub new { 2070sub new {
1901 my $class = shift; 2071 my $class = shift;
1902 2072
1903 my $self = $class->SUPER::new ( 2073 my $self = $class->SUPER::new (
1904 fontsize => 1, 2074 fontsize => 1,
2075 can_events => 0,
2076 #font => default_font
1905 @_, 2077 @_,
1906 2078
1907 layout => (new CFClient::Layout), 2079 layout => (new CFClient::Layout),
1908 par => [], 2080 par => [],
1909 height => 0, 2081 height => 0,
1910 children => [ 2082 children => [
1911 (new CFClient::UI::Empty expand => 1), 2083 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2084 (new CFClient::UI::Slider vertical => 1),
1913 ], 2085 ],
1914 ); 2086 );
1915 2087
… …
1949sub size_allocate { 2121sub size_allocate {
1950 my ($self, $w, $h) = @_; 2122 my ($self, $w, $h) = @_;
1951 2123
1952 $self->SUPER::size_allocate ($w, $h); 2124 $self->SUPER::size_allocate ($w, $h);
1953 2125
2126 $self->{layout}->set_font ($self->{font}) if $self->{font};
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2127 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $self->{layout}->set_width ($self->{children}[0]{w}); 2128 $self->{layout}->set_width ($self->{children}[0]{w});
1956 2129
1957 $self->reflow; 2130 $self->reflow;
1958} 2131}
… …
1994 2167
1995 delete $self->{texture}; 2168 delete $self->{texture};
1996 } 2169 }
1997 2170
1998 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1999 glClearColor 0, 0, 0, 1; 2172 glClearColor 0, 0, 0, 0;
2000 glClear GL_COLOR_BUFFER_BIT; 2173 glClear GL_COLOR_BUFFER_BIT;
2001 2174
2002 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2003 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2004 glEnable GL_TEXTURE_2D; 2177 glEnable GL_TEXTURE_2D;
… …
2011 2184
2012 my $y = 0; 2185 my $y = 0;
2013 2186
2014 my $layout = $self->{layout}; 2187 my $layout = $self->{layout};
2015 2188
2189 $layout->set_font ($self->{font}) if $self->{font};
2190
2016 for my $par (@{$self->{par}}) { 2191 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2192 my $h = $par->[0];
2018 2193
2019 if ($y0 < $y + $h && $y < $y1) { 2194 if ($y0 < $y + $h && $y < $y1) {
2020 $layout->set_text ($par->[2]); 2195 $layout->set_text ($par->[2]);
… …
2035 2210
2036sub _draw { 2211sub _draw {
2037 my ($self) = @_; 2212 my ($self) = @_;
2038 2213
2039 if ($self->{texture}) { 2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2040 glEnable GL_TEXTURE_2D; 2217 glEnable GL_TEXTURE_2D;
2041 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1;
2042 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2043 glDisable GL_TEXTURE_2D; 2221 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2044 } 2223 }
2045 2224
2046 $self->{children}[1]->draw; 2225 $self->{children}[1]->draw;
2047 2226
2048} 2227}
… …
2097 2276
2098sub new { 2277sub new {
2099 my $class = shift; 2278 my $class = shift;
2100 2279
2101 my $self = $class->SUPER::new ( 2280 my $self = $class->SUPER::new (
2102 state => 0, 2281 state => 0,
2103 connect_activate => \&toggle_flopper, 2282 connect_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2283 @_
2106 ); 2284 );
2107 2285
2108 if ($self->{state}) { 2286 if ($self->{state}) {
2109 $self->{state} = 0; 2287 $self->{state} = 0;
… …
2129 $self->emit (changed => $self->{state}); 2307 $self->emit (changed => $self->{state});
2130} 2308}
2131 2309
2132############################################################################# 2310#############################################################################
2133 2311
2312package CFClient::UI::Tooltip;
2313
2314our @ISA = CFClient::UI::Bin::;
2315
2316use CFClient::OpenGL;
2317
2318sub new {
2319 my $class = shift;
2320
2321 $class->SUPER::new (
2322 @_,
2323 can_events => 0,
2324 )
2325}
2326
2327sub set_markup {
2328 my ($self, $text) = @_;
2329
2330 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2331 $self->{label}->set_markup ($text);
2332 $self->add ($self->{label});
2333}
2334
2335sub size_request {
2336 my ($self) = @_;
2337
2338 $self->child->set_max_size ($::WIDTH * 0.3);
2339
2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2341
2342 ($w + 4, $h + 4)
2343}
2344
2345sub size_allocate {
2346 my ($self, $w, $h) = @_;
2347
2348 $self->SUPER::size_allocate ($w - 4, $h - 4);
2349}
2350
2351sub _draw {
2352 my ($self) = @_;
2353
2354 glPushMatrix;
2355 glTranslate 0.375, 0.375;
2356
2357 my ($w, $h) = @$self{qw(w h)};
2358
2359 glColor 1, 0.8, 0.4;
2360 glBegin GL_QUADS;
2361 glVertex 0 , 0;
2362 glVertex 0 , $h;
2363 glVertex $w, $h;
2364 glVertex $w, 0;
2365 glEnd;
2366
2367 glColor 0, 0, 0;
2368 glBegin GL_LINE_LOOP;
2369 glVertex 0 , 0;
2370 glVertex 0 , $h;
2371 glVertex $w, $h;
2372 glVertex $w, 0;
2373 glEnd;
2374
2375 glPopMatrix;
2376
2377 glTranslate 2, 2;
2378 $self->SUPER::_draw;
2379}
2380
2381#############################################################################
2382
2383package CFClient::UI::Face;
2384
2385our @ISA = CFClient::UI::Base::;
2386
2387use CFClient::OpenGL;
2388
2389sub new {
2390 my $class = shift;
2391
2392 $class->SUPER::new (
2393 aspect => 1,
2394 @_,
2395 )
2396}
2397
2398sub size_request {
2399 (32, 8)
2400}
2401
2402sub draw {
2403 my ($self) = @_;
2404
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406
2407 if ($tex) {
2408 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2412 glColor 1, 1, 1, 1;
2413 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2414 glDisable GL_TEXTURE_2D;
2415 glDisable GL_BLEND;
2416 }
2417}
2418
2419#############################################################################
2420
2134package CFClient::UI::Root; 2421package CFClient::UI::Root;
2135 2422
2136our @ISA = CFClient::UI::Container::; 2423our @ISA = CFClient::UI::Container::;
2137 2424
2138use CFClient::OpenGL; 2425use CFClient::OpenGL;
… …
2213############################################################################# 2500#############################################################################
2214 2501
2215package CFClient::UI; 2502package CFClient::UI;
2216 2503
2217$ROOT = new CFClient::UI::Root; 2504$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2505$TOOLTIP = new CFClient::UI::Tooltip;
2219 2506
22201 25071
2221 2508

Diff Legend

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