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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 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
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);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $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 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $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 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
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 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
101 can_events => 1, 153 can_events => 1,
102 @_ 154 @_
103 }, $class; 155 }, $class;
104 156
105 for (keys %$self) { 157 for (keys %$self) {
… …
109 } 161 }
110 162
111 $self 163 $self
112} 164}
113 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
114sub show { 173sub show {
115 my ($self) = @_; 174 my ($self) = @_;
116 175
117 return if $self->{parent}; 176 return if $self->{parent};
118 177
… …
120} 179}
121 180
122sub hide { 181sub hide {
123 my ($self) = @_; 182 my ($self) = @_;
124 183
125 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
126 186
127 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
128} 189}
129 190
130sub move { 191sub move {
131 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
132 193
… …
135 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
136 197
137 $self->update; 198 $self->update;
138} 199}
139 200
140sub needs_redraw { 201sub set_size {
141 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
142} 208}
143 209
144sub size_request { 210sub size_request {
145 require Carp; 211 require Carp;
146 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
178 244
179sub size_allocate { 245sub size_allocate {
180 # nothing to be done 246 # nothing to be done
181} 247}
182 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
183# return top left coordinates 269# return top left coordinates
184sub _topleft { 270sub _topleft {
185 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
186 275
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
188} 277}
189 278
190# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
270 glEnd; 359 glEnd;
271 glDisable GL_BLEND; 360 glDisable GL_BLEND;
272 } 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 }
273} 376}
274 377
275sub _draw { 378sub _draw {
276 my ($self) = @_; 379 my ($self) = @_;
277 380
… …
297} 400}
298 401
299sub check_size { 402sub check_size {
300 my ($self) = @_; 403 my ($self) = @_;
301 404
302 return unless $self->{parent}; 405 $self->{parent}
406 or return 1;
303 407
304 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;
305 411
306 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w; 413 $self->{req_w} = $w;
308 $self->{req_h} = $h; 414 $self->{req_h} = $h;
309 415
310 $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
311 } 425 }
312} 426}
313 427
314sub update { 428sub update {
315 my ($self) = @_; 429 my ($self) = @_;
… …
325} 439}
326 440
327sub emit { 441sub emit {
328 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
329 443
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
331 $cb->($self, @args);
332 }
333} 445}
334 446
335sub DESTROY { 447sub DESTROY {
336 my ($self) = @_; 448 my ($self) = @_;
337 449
… …
404sub new { 516sub new {
405 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
406 518
407 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
408 520
409 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 );
410 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
411 527
412 $self 528 $self
413} 529}
414 530
… …
425 ]; 541 ];
426 542
427 $child->check_size; 543 $child->check_size;
428} 544}
429 545
546sub children {
547 @{ $_[0]{children} }
548}
549
430sub remove { 550sub remove {
431 my ($self, $child) = @_; 551 my ($self, $child) = @_;
432 552
433 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
434 555
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 557
437 $self->check_size; 558 $self->check_size;
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 }
438} 572}
439 573
440sub find_widget { 574sub find_widget {
441 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
442 576
… …
517} 651}
518 652
519sub update { 653sub update {
520 my ($self) = @_; 654 my ($self) = @_;
521 655
522 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 657 $self->SUPER::update;
525} 658}
526 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
527sub render_chld { 667sub render_child {
528 my ($self) = @_; 668 my ($self) = @_;
529 669
530 $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 {
531 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
532 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
533 $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;
534 }; 681 };
535}
536
537sub size_allocate {
538 my ($self, $w, $h) = @_;
539
540 $self->child->configure (0, 0, $w, $h);
541
542 $self->render_chld;
543} 682}
544 683
545sub _draw { 684sub _draw {
546 my ($self) = @_; 685 my ($self) = @_;
547 686
… …
549 688
550 my $tex = $self->{texture} 689 my $tex = $self->{texture}
551 or return; 690 or return;
552 691
553 glEnable GL_BLEND; 692 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
556 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;
557 697
558 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
559 699
560 glDisable GL_BLEND; 700 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
602 border => 0.8, 742 border => 0.8,
603 @_ 743 @_
604 ); 744 );
605 745
606 $self 746 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614}
615
616sub size_request {
617 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h})
619}
620
621sub size_allocate {
622 my ($self, $w, $h) = @_;
623 $self->{w} = $w;
624 $self->{h} = $h;
625 $self->child->configure (0, 0, $w, $h);
626} 747}
627 748
628sub _draw { 749sub _draw {
629 my ($self) = @_; 750 my ($self) = @_;
630 751
… …
665 my $class = shift; 786 my $class = shift;
666 787
667 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
668 789
669 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
672 border => 0.8, 793 border => 0.8,
673 can_events => 1, 794 can_events => 1,
674 @_ 795 @_
675 ); 796 );
676 797
677 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
… …
688} 809}
689 810
690sub size_request { 811sub size_request {
691 my ($self) = @_; 812 my ($self) = @_;
692 813
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694
695 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
696 815
697 ( 816 (
698 $w + $self->border * 2, 817 $w + $self->border * 2,
699 $h + $self->border * 2, 818 $h + $self->border * 2,
… …
827 $self->{children}[$y][$x] = $child; 946 $self->{children}[$y][$x] = $child;
828 947
829 $child->check_size; 948 $child->check_size;
830} 949}
831 950
951sub children {
952 grep $_, map @$_, grep $_, @{ $_[0]{children} }
953}
954
832# 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?
833sub clear { 956sub clear {
834 my ($self) = @_; 957 my ($self) = @_;
835 958
959 my @children = $self->children;
836 delete $self->{children}; 960 delete $self->{children};
961
962 for (@children) {
963 delete $_->{parent};
964 $_->hide;
965 }
966
837 $self->update; 967 $self->update;
838} 968}
839 969
840sub get_wh { 970sub get_wh {
841 my ($self) = @_; 971 my ($self) = @_;
… …
1064 1194
1065sub new { 1195sub new {
1066 my ($class, %arg) = @_; 1196 my ($class, %arg) = @_;
1067 1197
1068 my $self = $class->SUPER::new ( 1198 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1199 fg => [1, 1, 1],
1200 #font => default_font
1070 fontsize => 1, 1201 fontsize => 1,
1071 text => "", 1202 text => "",
1072 align => -1, 1203 align => -1,
1073 valign => -1, 1204 valign => -1,
1074 padding => 2, 1205 padding => 2,
1075 layout => new CFClient::Layout, 1206 layout => new CFClient::Layout,
1076 can_events => 0, 1207 can_events => 0,
1077 %arg 1208 %arg
1078 ); 1209 );
1079 1210
1080 if (exists $self->{template}) { 1211 if (exists $self->{template}) {
… …
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1218 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1088 1219
1089 $self 1220 $self
1090} 1221}
1091 1222
1092sub escape_text { 1223sub escape {
1093 local $_ = $_[1]; 1224 local $_ = $_[1];
1094 1225
1095 s/&/&amp;/g; 1226 s/&/&amp;/g;
1096 s/>/&gt;/g; 1227 s/>/&gt;/g;
1097 s/</&lt;/g; 1228 s/</&lt;/g;
1098 1229
1099 $_[1] 1230 $_[1]
1100} 1231}
1101 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
1102sub set_text { 1246sub set_text {
1103 my ($self, $text) = @_; 1247 my ($self, $text) = @_;
1104 1248
1249 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text";
1251
1105 $self->{layout}->set_text ($text); 1252 $self->{layout}->set_text ($text);
1106 1253
1107 delete $self->{texture}; 1254 delete $self->{texture};
1255 $self->update;
1108 $self->check_size; 1256 $self->check_size;
1109 $self->update;
1110} 1257}
1111 1258
1112sub set_markup { 1259sub set_markup {
1113 my ($self, $markup) = @_; 1260 my ($self, $markup) = @_;
1114 1261
1262 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup";
1264
1115 $self->{layout}->set_markup ($markup); 1265 $self->{layout}->set_markup ($markup);
1116 1266
1117 delete $self->{texture}; 1267 delete $self->{texture};
1268 $self->update;
1118 $self->check_size; 1269 $self->check_size;
1119 $self->update;
1120} 1270}
1121 1271
1122sub size_request { 1272sub size_request {
1123 my ($self) = @_; 1273 my ($self) = @_;
1124 1274
1125 $self->{layout}->set_width; 1275 $self->{layout}->set_font ($self->{font}) if $self->{font};
1276 $self->{layout}->set_width ($self->{max_w} || -1);
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1277 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1278
1128 my ($w, $h) = $self->{layout}->size; 1279 my ($w, $h) = $self->{layout}->size;
1129 1280
1130 if (exists $self->{template}) { 1281 if (exists $self->{template}) {
1282 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1283 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1284
1133 my ($w2, $h2) = $self->{template}->size; 1285 my ($w2, $h2) = $self->{template}->size;
1134 1286
1135 $w = List::Util::max $w, $w2; 1287 $w = List::Util::max $w, $w2;
… …
1150 1302
1151sub set_fontsize { 1303sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1304 my ($self, $fontsize) = @_;
1153 1305
1154 $self->{fontsize} = $fontsize; 1306 $self->{fontsize} = $fontsize;
1307 delete $self->{texture};
1155 $self->check_size; 1308 $self->check_size;
1309 $self->update;
1156} 1310}
1157 1311
1158sub _draw { 1312sub _draw {
1159 my ($self) = @_; 1313 my ($self) = @_;
1160 1314
1161 my $tex = $self->{texture} ||= do { 1315 my $tex = $self->{texture} ||= do {
1316 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1317 $self->{layout}->set_width ($self->{w});
1163 $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);
1164 new_from_layout CFClient::Texture $self->{layout} 1319 new_from_layout CFClient::Texture $self->{layout}
1165 }; 1320 };
1166 1321
… …
1199 1354
1200sub new { 1355sub new {
1201 my $class = shift; 1356 my $class = shift;
1202 1357
1203 $class->SUPER::new ( 1358 $class->SUPER::new (
1204 fg => [1, 1, 1], 1359 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1360 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1361 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1362 active_fg => [0, 0, 0],
1208 can_hover => 1, 1363 can_hover => 1,
1209 can_focus => 1, 1364 can_focus => 1,
1210 valign => 0, 1365 valign => 0,
1211 can_events => 1, 1366 can_events => 1,
1212 @_ 1367 @_
1213 ) 1368 )
1214} 1369}
1215 1370
… …
1369 my ($self, $ev) = @_; 1524 my ($self, $ev) = @_;
1370 1525
1371 my $sym = $ev->{sym}; 1526 my $sym = $ev->{sym};
1372 1527
1373 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} = '';
1374 $self->emit (activate => $self->get_text); 1533 $self->emit (activate => $txt);
1375 $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 }
1376 1557
1377 } else { 1558 } else {
1378 $self->SUPER::key_down ($ev); 1559 $self->SUPER::key_down ($ev);
1379 } 1560 }
1380 1561
… …
1394 1575
1395sub new { 1576sub new {
1396 my $class = shift; 1577 my $class = shift;
1397 1578
1398 $class->SUPER::new ( 1579 $class->SUPER::new (
1399 padding => 4, 1580 padding => 4,
1400 fg => [1, 1, 1], 1581 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2], 1582 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1583 active_fg => [0, 0, 1],
1403 can_hover => 1, 1584 can_hover => 1,
1404 align => 0, 1585 align => 0,
1405 valign => 0, 1586 valign => 0,
1406 can_events => 1, 1587 can_events => 1,
1407 @_ 1588 @_
1408 ) 1589 )
1409} 1590}
1410 1591
… …
1569 1750
1570package CFClient::UI::VGauge; 1751package CFClient::UI::VGauge;
1571 1752
1572our @ISA = CFClient::UI::Base::; 1753our @ISA = CFClient::UI::Base::;
1573 1754
1755use List::Util qw(min max);
1756
1574use CFClient::OpenGL; 1757use CFClient::OpenGL;
1575 1758
1576my %tex = ( 1759my %tex = (
1577 food => [ 1760 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1761 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1762 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1763 ],
1581 grace => [ 1764 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1765 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 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/
1584 ], 1767 ],
1585 hp => [ 1768 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1769 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1770 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1771 ],
1589 mana => [ 1772 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1773 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 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/
1592 ], 1775 ],
1593); 1776);
1594 1777
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1778# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 1779sub new {
… …
1615} 1798}
1616 1799
1617sub set_max { 1800sub set_max {
1618 my ($self, $max) = @_; 1801 my ($self, $max) = @_;
1619 1802
1803 return if $self->{max_val} == $max;
1804
1620 $self->{max_val} = $max; 1805 $self->{max_val} = $max;
1806 $self->update;
1621} 1807}
1622 1808
1623sub set_value { 1809sub set_value {
1624 my ($self, $val, $max) = @_; 1810 my ($self, $val, $max) = @_;
1625 1811
1626 $self->set_max ($max) 1812 $self->set_max ($max)
1627 if defined $max; 1813 if defined $max;
1628 1814
1629 $max = $self->{max_val}; 1815 return if $self->{val} == $val;
1816
1630 $self->{val} = $val; 1817 $self->{val} = $val;
1631
1632 $self->update; 1818 $self->update;
1633} 1819}
1634 1820
1635sub _draw { 1821sub _draw {
1636 my ($self) = @_; 1822 my ($self) = @_;
1637 1823
1638 my $tex = $tex{$self->{type}}; 1824 my $tex = $tex{$self->{type}};
1825 my ($t1, $t2, $t3) = @$tex;
1639 1826
1640 my ($w, $h) = ($self->{w}, $self->{h}); 1827 my ($w, $h) = ($self->{w}, $self->{h});
1641 1828
1642 if ($self->{vertical}) { 1829 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 1830 glRotate 90, 0, 0, 1;
… …
1645 1832
1646 ($w, $h) = ($h, $w); 1833 ($w, $h) = ($h, $w);
1647 } 1834 }
1648 1835
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 1836 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 1837
1652 my $t1 = $tex->[0]; 1838 my $ycut1 = max 0, min 1, $ycut;
1653 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);
1654 1843
1655 glEnable GL_BLEND; 1844 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 1848
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1849 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 1850 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 1851 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1852 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1853 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1854 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 1855 glEnd;
1670 1856
1857 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1858 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 1859 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1860 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1861 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1862 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1863 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 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 }
1678 1875
1679 glDisable GL_BLEND; 1876 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 1877 glDisable GL_TEXTURE_2D;
1681} 1878}
1682 1879
… …
1685package CFClient::UI::Gauge; 1882package CFClient::UI::Gauge;
1686 1883
1687our @ISA = CFClient::UI::VBox::; 1884our @ISA = CFClient::UI::VBox::;
1688 1885
1689sub new { 1886sub new {
1690 my ($class, %arg) = shift; 1887 my ($class, %arg) = @_;
1691 1888
1692 my $self = $class->SUPER::new ( 1889 my $self = $class->SUPER::new (
1693 @_, 1890 tooltip => $arg{type},
1891 can_hover => 1,
1892 can_events => 1,
1893 %arg,
1694 ); 1894 );
1695 1895
1696 $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");
1897 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $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");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 1899
1702 $self 1900 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 1901}
1709 1902
1710sub set_fontsize { 1903sub set_fontsize {
1711 my ($self, $fsize) = @_; 1904 my ($self, $fsize) = @_;
1712 1905
1713 $self->{value}->set_fontsize ($fsize); 1906 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 1907 $self->{max} ->set_fontsize ($fsize);
1715} 1908}
1716 1909
1910sub set_max {
1911 my ($self, $max) = @_;
1912
1913 $self->{gauge}->set_max ($max);
1914 $self->{max}->set_text ($max);
1915}
1916
1717sub set_value { 1917sub set_value {
1718 my ($self, $val, $max) = @_; 1918 my ($self, $val, $max) = @_;
1719 1919
1720 $self->set_max ($max) 1920 $self->set_max ($max)
1721 if defined $max; 1921 if defined $max;
1722 1922
1723 $self->{gauge}->set_value ($val, $max); 1923 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 1924 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 1925}
1733 1926
1734############################################################################# 1927#############################################################################
1735 1928
1736package CFClient::UI::Slider; 1929package CFClient::UI::Slider;
… …
1876 2069
1877sub new { 2070sub new {
1878 my $class = shift; 2071 my $class = shift;
1879 2072
1880 my $self = $class->SUPER::new ( 2073 my $self = $class->SUPER::new (
1881 fontsize => 1, 2074 fontsize => 1,
2075 can_events => 0,
2076 #font => default_font
1882 @_, 2077 @_,
1883 2078
1884 layout => (new CFClient::Layout), 2079 layout => (new CFClient::Layout),
1885 par => [], 2080 par => [],
1886 height => 0, 2081 height => 0,
1887 children => [ 2082 children => [
1888 (new CFClient::UI::Empty expand => 1), 2083 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2084 (new CFClient::UI::Slider vertical => 1),
1890 ], 2085 ],
1891 ); 2086 );
1892 2087
… …
1926sub size_allocate { 2121sub size_allocate {
1927 my ($self, $w, $h) = @_; 2122 my ($self, $w, $h) = @_;
1928 2123
1929 $self->SUPER::size_allocate ($w, $h); 2124 $self->SUPER::size_allocate ($w, $h);
1930 2125
2126 $self->{layout}->set_font ($self->{font}) if $self->{font};
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2127 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1932 $self->{layout}->set_width ($self->{children}[0]{w}); 2128 $self->{layout}->set_width ($self->{children}[0]{w});
1933 2129
1934 $self->reflow; 2130 $self->reflow;
1935} 2131}
… …
1971 2167
1972 delete $self->{texture}; 2168 delete $self->{texture};
1973 } 2169 }
1974 2170
1975 $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 {
1976 glClearColor 0, 0, 0, 1; 2172 glClearColor 0, 0, 0, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2173 glClear GL_COLOR_BUFFER_BIT;
1978 2174
1979 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2177 glEnable GL_TEXTURE_2D;
… …
1988 2184
1989 my $y = 0; 2185 my $y = 0;
1990 2186
1991 my $layout = $self->{layout}; 2187 my $layout = $self->{layout};
1992 2188
2189 $layout->set_font ($self->{font}) if $self->{font};
2190
1993 for my $par (@{$self->{par}}) { 2191 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2192 my $h = $par->[0];
1995 2193
1996 if ($y0 < $y + $h && $y < $y1) { 2194 if ($y0 < $y + $h && $y < $y1) {
1997 $layout->set_text ($par->[2]); 2195 $layout->set_text ($par->[2]);
… …
2012 2210
2013sub _draw { 2211sub _draw {
2014 my ($self) = @_; 2212 my ($self) = @_;
2015 2213
2016 if ($self->{texture}) { 2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2017 glEnable GL_TEXTURE_2D; 2217 glEnable GL_TEXTURE_2D;
2018 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;
2019 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2020 glDisable GL_TEXTURE_2D; 2221 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2021 } 2223 }
2022 2224
2023 $self->{children}[1]->draw; 2225 $self->{children}[1]->draw;
2024 2226
2025} 2227}
… …
2074 2276
2075sub new { 2277sub new {
2076 my $class = shift; 2278 my $class = shift;
2077 2279
2078 my $self = $class->SUPER::new ( 2280 my $self = $class->SUPER::new (
2079 state => 0, 2281 state => 0,
2080 connect_activate => \&toggle_flopper, 2282 connect_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2283 @_
2083 ); 2284 );
2084 2285
2085 if ($self->{state}) { 2286 if ($self->{state}) {
2086 $self->{state} = 0; 2287 $self->{state} = 0;
… …
2106 $self->emit (changed => $self->{state}); 2307 $self->emit (changed => $self->{state});
2107} 2308}
2108 2309
2109############################################################################# 2310#############################################################################
2110 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
2111package CFClient::UI::Root; 2421package CFClient::UI::Root;
2112 2422
2113our @ISA = CFClient::UI::Container::; 2423our @ISA = CFClient::UI::Container::;
2114 2424
2115use CFClient::OpenGL; 2425use CFClient::OpenGL;
… …
2190############################################################################# 2500#############################################################################
2191 2501
2192package CFClient::UI; 2502package CFClient::UI;
2193 2503
2194$ROOT = new CFClient::UI::Root; 2504$ROOT = new CFClient::UI::Root;
2505$TOOLTIP = new CFClient::UI::Tooltip;
2195 2506
21961 25071
2197 2508

Diff Legend

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