ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.149 by root, Sat Apr 22 23:11:32 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 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,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
177 244
178sub size_allocate { 245sub size_allocate {
179 # nothing to be done 246 # nothing to be done
180} 247}
181 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
182# return top left coordinates 269# return top left coordinates
183sub _topleft { 270sub _topleft {
184 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
185 275
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 277}
188 278
189# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
269 glEnd; 359 glEnd;
270 glDisable GL_BLEND; 360 glDisable GL_BLEND;
271 } 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 }
272} 376}
273 377
274sub _draw { 378sub _draw {
275 my ($self) = @_; 379 my ($self) = @_;
276 380
277 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
278} 382}
279 383
280sub find_widget { 384sub find_widget {
281 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
282 388
283 return $self 389 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 392
… …
294} 400}
295 401
296sub check_size { 402sub check_size {
297 my ($self) = @_; 403 my ($self) = @_;
298 404
299 return unless $self->{parent}; 405 $self->{parent}
406 or return 1;
300 407
301 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;
302 411
303 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
304 $self->{req_w} = $w; 413 $self->{req_w} = $w;
305 $self->{req_h} = $h; 414 $self->{req_h} = $h;
306 415
307 $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
308 } 425 }
309} 426}
310 427
311sub update { 428sub update {
312 my ($self) = @_; 429 my ($self) = @_;
… …
322} 439}
323 440
324sub emit { 441sub emit {
325 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
326 443
327 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
328 $cb->($self, @args);
329 }
330} 445}
331 446
332sub DESTROY { 447sub DESTROY {
333 my ($self) = @_; 448 my ($self) = @_;
334 449
… …
379 494
380package CFClient::UI::Empty; 495package CFClient::UI::Empty;
381 496
382our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
383 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
384sub size_request { 504sub size_request {
385 (0, 0) 505 (0, 0)
386} 506}
387 507
388sub draw { } 508sub draw { }
… …
396sub new { 516sub new {
397 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
398 518
399 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
400 520
401 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
402 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
403 527
404 $self 528 $self
405} 529}
406 530
… …
417 ]; 541 ];
418 542
419 $child->check_size; 543 $child->check_size;
420} 544}
421 545
546sub children {
547 @{ $_[0]{children} }
548}
549
422sub remove { 550sub remove {
423 my ($self, $child) = @_; 551 my ($self, $child) = @_;
424 552
425 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
426 555
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 557
429 $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 }
430} 572}
431 573
432sub find_widget { 574sub find_widget {
433 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
434 576
… …
509} 651}
510 652
511sub update { 653sub update {
512 my ($self) = @_; 654 my ($self) = @_;
513 655
514 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
515 $self->render_chld;
516 $self->SUPER::update; 657 $self->SUPER::update;
517} 658}
518 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
519sub render_chld { 667sub render_child {
520 my ($self) = @_; 668 my ($self) = @_;
521 669
522 $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 {
523 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
524 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
525 $self->child->draw; 673 $self->child->draw;
526 }; 674 };
527} 675}
528 676
529sub size_allocate {
530 my ($self, $w, $h) = @_;
531
532 $self->child->configure (0, 0, $w, $h);
533
534 $self->render_chld;
535}
536
537sub _draw { 677sub _draw {
538 my ($self) = @_; 678 my ($self) = @_;
539 679
540 my ($w, $h) = ($self->w, $self->h); 680 my ($w, $h) = ($self->w, $self->h);
541 681
542 my $tex = $self->{texture} 682 my $tex = $self->{texture}
543 or return; 683 or return;
544 684
545 glEnable GL_BLEND; 685 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glEnable GL_TEXTURE_2D; 687 glEnable GL_TEXTURE_2D;
548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1;
549 690
550 $tex->draw_quad (0, 0, $w, $h); 691 $tex->draw_quad (0, 0, $w, $h);
551 692
552 glDisable GL_BLEND; 693 glDisable GL_BLEND;
553 glDisable GL_TEXTURE_2D; 694 glDisable GL_TEXTURE_2D;
… …
594 border => 0.8, 735 border => 0.8,
595 @_ 736 @_
596 ); 737 );
597 738
598 $self 739 $self
599}
600
601sub set_size {
602 my ($self, $w, $h) = @_;
603 $self->{req_w} = $w;
604 $self->{req_h} = $h;
605 $self->check_size;
606}
607
608sub size_request {
609 my ($self) = @_;
610 ($self->{req_w}, $self->{req_h})
611}
612
613sub size_allocate {
614 my ($self, $w, $h) = @_;
615 $self->{w} = $w;
616 $self->{h} = $h;
617 $self->child->configure (0, 0, $w, $h);
618} 740}
619 741
620sub _draw { 742sub _draw {
621 my ($self) = @_; 743 my ($self) = @_;
622 744
… …
657 my $class = shift; 779 my $class = shift;
658 780
659 # TODO: user_x, user_y, overwrite moveto? 781 # TODO: user_x, user_y, overwrite moveto?
660 782
661 my $self = $class->SUPER::new ( 783 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 784 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 785 border_bg => [1, 1, 1, 1],
664 border => 0.8, 786 border => 0.8,
787 can_events => 1,
665 @_ 788 @_
666 ); 789 );
667 790
668 $self->{title} &&= new CFClient::UI::Label 791 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 792 align => 0,
… …
679} 802}
680 803
681sub size_request { 804sub size_request {
682 my ($self) = @_; 805 my ($self) = @_;
683 806
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685
686 my ($w, $h) = $self->SUPER::size_request; 807 my ($w, $h) = $self->SUPER::size_request;
687 808
688 ( 809 (
689 $w + $self->border * 2, 810 $w + $self->border * 2,
690 $h + $self->border * 2, 811 $h + $self->border * 2,
… …
818 $self->{children}[$y][$x] = $child; 939 $self->{children}[$y][$x] = $child;
819 940
820 $child->check_size; 941 $child->check_size;
821} 942}
822 943
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
823# TODO: move to container class maybe? send childs a signal on removal? 948# TODO: move to container class maybe? send childs a signal on removal?
824sub clear { 949sub clear {
825 my ($self) = @_; 950 my ($self) = @_;
826 951
952 my @children = $self->children;
827 delete $self->{children}; 953 delete $self->{children};
954
955 for (@children) {
956 delete $_->{parent};
957 $_->hide;
958 }
959
828 $self->update; 960 $self->update;
829} 961}
830 962
831sub get_wh { 963sub get_wh {
832 my ($self) = @_; 964 my ($self) = @_;
… …
1055 1187
1056sub new { 1188sub new {
1057 my ($class, %arg) = @_; 1189 my ($class, %arg) = @_;
1058 1190
1059 my $self = $class->SUPER::new ( 1191 my $self = $class->SUPER::new (
1060 fg => [1, 1, 1], 1192 fg => [1, 1, 1],
1193 #font => default_font
1061 fontsize => 1, 1194 fontsize => 1,
1062 text => "", 1195 text => "",
1063 align => -1, 1196 align => -1,
1064 valign => -1, 1197 valign => -1,
1065 padding => 2, 1198 padding => 2,
1066 layout => new CFClient::Layout, 1199 layout => new CFClient::Layout,
1200 can_events => 0,
1067 %arg 1201 %arg
1068 ); 1202 );
1069 1203
1070 if (exists $self->{template}) { 1204 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1205 my $layout = new CFClient::Layout;
… …
1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1078 1212
1079 $self 1213 $self
1080} 1214}
1081 1215
1082sub escape_text { 1216sub escape {
1083 local $_ = $_[1]; 1217 local $_ = $_[1];
1084 1218
1085 s/&/&amp;/g; 1219 s/&/&amp;/g;
1086 s/>/&gt;/g; 1220 s/>/&gt;/g;
1087 s/</&lt;/g; 1221 s/</&lt;/g;
1088 1222
1089 $_[1] 1223 $_[1]
1090} 1224}
1091 1225
1226sub update {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230 $self->SUPER::update;
1231}
1232
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1092sub set_text { 1239sub set_text {
1093 my ($self, $text) = @_; 1240 my ($self, $text) = @_;
1094 1241
1242 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text";
1244
1095 $self->{layout}->set_text ($text); 1245 $self->{layout}->set_text ($text);
1096 1246
1097 delete $self->{texture}; 1247 delete $self->{texture};
1248 $self->update;
1098 $self->check_size; 1249 $self->check_size;
1099 $self->update;
1100} 1250}
1101 1251
1102sub set_markup { 1252sub set_markup {
1103 my ($self, $markup) = @_; 1253 my ($self, $markup) = @_;
1104 1254
1255 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup";
1257
1105 $self->{layout}->set_markup ($markup); 1258 $self->{layout}->set_markup ($markup);
1106 1259
1107 delete $self->{texture}; 1260 delete $self->{texture};
1261 $self->update;
1108 $self->check_size; 1262 $self->check_size;
1109 $self->update;
1110} 1263}
1111 1264
1112sub size_request { 1265sub size_request {
1113 my ($self) = @_; 1266 my ($self) = @_;
1114 1267
1115 $self->{layout}->set_width; 1268 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1);
1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1117 1271
1118 my ($w, $h) = $self->{layout}->size; 1272 my ($w, $h) = $self->{layout}->size;
1119 1273
1120 if (exists $self->{template}) { 1274 if (exists $self->{template}) {
1275 $self->{template}->set_font ($self->{font}) if $self->{font};
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1276 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122 1277
1123 my ($w2, $h2) = $self->{template}->size; 1278 my ($w2, $h2) = $self->{template}->size;
1124 1279
1125 $w = List::Util::max $w, $w2; 1280 $w = List::Util::max $w, $w2;
… …
1140 1295
1141sub set_fontsize { 1296sub set_fontsize {
1142 my ($self, $fontsize) = @_; 1297 my ($self, $fontsize) = @_;
1143 1298
1144 $self->{fontsize} = $fontsize; 1299 $self->{fontsize} = $fontsize;
1300 delete $self->{texture};
1145 $self->check_size; 1301 $self->check_size;
1302 $self->update;
1146} 1303}
1147 1304
1148sub _draw { 1305sub _draw {
1149 my ($self) = @_; 1306 my ($self) = @_;
1150 1307
1151 my $tex = $self->{texture} ||= do { 1308 my $tex = $self->{texture} ||= do {
1309 $self->{layout}->set_font ($self->{font}) if $self->{font};
1152 $self->{layout}->set_width ($self->{w}); 1310 $self->{layout}->set_width ($self->{w});
1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1154 new_from_layout CFClient::Texture $self->{layout} 1312 new_from_layout CFClient::Texture $self->{layout}
1155 }; 1313 };
1156 1314
… …
1189 1347
1190sub new { 1348sub new {
1191 my $class = shift; 1349 my $class = shift;
1192 1350
1193 $class->SUPER::new ( 1351 $class->SUPER::new (
1194 fg => [1, 1, 1], 1352 fg => [1, 1, 1],
1195 bg => [0, 0, 0, 0.2], 1353 bg => [0, 0, 0, 0.2],
1196 active_bg => [1, 1, 1, 0.5], 1354 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1355 active_fg => [0, 0, 0],
1198 can_hover => 1, 1356 can_hover => 1,
1199 can_focus => 1, 1357 can_focus => 1,
1200 valign => 0, 1358 valign => 0,
1359 can_events => 1,
1201 @_ 1360 @_
1202 ) 1361 )
1203} 1362}
1204 1363
1205sub _set_text { 1364sub _set_text {
… …
1358 my ($self, $ev) = @_; 1517 my ($self, $ev) = @_;
1359 1518
1360 my $sym = $ev->{sym}; 1519 my $sym = $ev->{sym};
1361 1520
1362 if ($sym == 13) { 1521 if ($sym == 13) {
1522 unshift @{$self->{history}},
1523 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = '';
1363 $self->emit (activate => $self->get_text); 1526 $self->emit (activate => $txt);
1364 $self->update; 1527 $self->update;
1528
1529 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text;
1532 }
1533 if (@{$self->{history} || []} > 0) {
1534 $self->{history_pointer}++;
1535 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1536 $self->{history_pointer} = @{$self->{history} || []} - 1;
1537 }
1538 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1539 }
1540
1541 } elsif ($sym == CFClient::SDLK_DOWN) {
1542 $self->{history_pointer}--;
1543 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1544
1545 if ($self->{history_pointer} >= 0) {
1546 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1547 } else {
1548 $self->set_text ($self->{history_saveback});
1549 }
1365 1550
1366 } else { 1551 } else {
1367 $self->SUPER::key_down ($ev); 1552 $self->SUPER::key_down ($ev);
1368 } 1553 }
1369 1554
… …
1383 1568
1384sub new { 1569sub new {
1385 my $class = shift; 1570 my $class = shift;
1386 1571
1387 $class->SUPER::new ( 1572 $class->SUPER::new (
1388 padding => 4, 1573 padding => 4,
1389 fg => [1, 1, 1], 1574 fg => [1, 1, 1],
1390 bg => [1, 1, 1, 0.2], 1575 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1576 active_fg => [0, 0, 1],
1392 can_hover => 1, 1577 can_hover => 1,
1393 align => 0, 1578 align => 0,
1394 valign => 0, 1579 valign => 0,
1580 can_events => 1,
1395 @_ 1581 @_
1396 ) 1582 )
1397} 1583}
1398 1584
1399sub button_up { 1585sub button_up {
… …
1504our %loaded_images; 1690our %loaded_images;
1505 1691
1506sub new { 1692sub new {
1507 my $class = shift; 1693 my $class = shift;
1508 1694
1509 my $self = $class->SUPER::new (@_); 1695 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1696
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1697 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1698
1513 $loaded_images{$self->{image}} ||= 1699 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1700 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1556############################################################################# 1742#############################################################################
1557 1743
1558package CFClient::UI::VGauge; 1744package CFClient::UI::VGauge;
1559 1745
1560our @ISA = CFClient::UI::Base::; 1746our @ISA = CFClient::UI::Base::;
1747
1748use List::Util qw(min max);
1561 1749
1562use CFClient::OpenGL; 1750use CFClient::OpenGL;
1563 1751
1564my %tex = ( 1752my %tex = (
1565 food => [ 1753 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1754 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1755 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ], 1756 ],
1569 grace => [ 1757 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1759 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1572 ], 1760 ],
1573 hp => [ 1761 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1763 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ], 1764 ],
1577 mana => [ 1765 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1766 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1767 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1580 ], 1768 ],
1581); 1769);
1582 1770
1583# eg. VGauge->new (gauge => 'food'), default gauge: food 1771# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new { 1772sub new {
… …
1603} 1791}
1604 1792
1605sub set_max { 1793sub set_max {
1606 my ($self, $max) = @_; 1794 my ($self, $max) = @_;
1607 1795
1796 return if $self->{max_val} == $max;
1797
1608 $self->{max_val} = $max; 1798 $self->{max_val} = $max;
1799 $self->update;
1609} 1800}
1610 1801
1611sub set_value { 1802sub set_value {
1612 my ($self, $val, $max) = @_; 1803 my ($self, $val, $max) = @_;
1613 1804
1614 $self->set_max ($max) 1805 $self->set_max ($max)
1615 if defined $max; 1806 if defined $max;
1616 1807
1617 $max = $self->{max_val}; 1808 return if $self->{val} == $val;
1809
1618 $self->{val} = $val; 1810 $self->{val} = $val;
1619
1620 $self->update; 1811 $self->update;
1621} 1812}
1622 1813
1623sub _draw { 1814sub _draw {
1624 my ($self) = @_; 1815 my ($self) = @_;
1625 1816
1626 my $tex = $tex{$self->{type}}; 1817 my $tex = $tex{$self->{type}};
1818 my ($t1, $t2, $t3) = @$tex;
1627 1819
1628 my ($w, $h) = ($self->{w}, $self->{h}); 1820 my ($w, $h) = ($self->{w}, $self->{h});
1629 1821
1630 if ($self->{vertical}) { 1822 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1; 1823 glRotate 90, 0, 0, 1;
… …
1633 1825
1634 ($w, $h) = ($h, $w); 1826 ($w, $h) = ($h, $w);
1635 } 1827 }
1636 1828
1637 my $ycut = $self->{val} / ($self->{max_val} || 1); 1829 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639 1830
1640 my $t1 = $tex->[0]; 1831 my $ycut1 = max 0, min 1, $ycut;
1641 my $t2 = $tex->[1]; 1832 my $ycut2 = max 0, min 1, $ycut - 1;
1833
1834 my $h1 = $self->{h} * (1 - $ycut1);
1835 my $h2 = $self->{h} * (1 - $ycut2);
1642 1836
1643 glEnable GL_BLEND; 1837 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 1841
1648 my $h1 = $self->{h} - $ycut * $self->{h};
1649 my $h2 = $ycut * $self->{h};
1650
1651 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1842 glBindTexture GL_TEXTURE_2D, $t1->{name};
1652 glBegin GL_QUADS; 1843 glBegin GL_QUADS;
1653 glTexCoord 0 , 0; glVertex 0 , 0; 1844 glTexCoord 0 , 0; glVertex 0 , 0;
1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1845 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1846 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1656 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1847 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1657 glEnd; 1848 glEnd;
1658 1849
1850 my $ycut1 = List::Util::min 1, $ycut;
1659 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1851 glBindTexture GL_TEXTURE_2D, $t2->{name};
1660 glBegin GL_QUADS; 1852 glBegin GL_QUADS;
1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1853 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1854 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1855 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1856 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1665 glEnd; 1857 glEnd;
1858
1859 if ($t3) {
1860 glBindTexture GL_TEXTURE_2D, $t3->{name};
1861 glBegin GL_QUADS;
1862 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1863 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1864 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1865 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1866 glEnd;
1867 }
1666 1868
1667 glDisable GL_BLEND; 1869 glDisable GL_BLEND;
1668 glDisable GL_TEXTURE_2D; 1870 glDisable GL_TEXTURE_2D;
1669} 1871}
1670 1872
… …
1673package CFClient::UI::Gauge; 1875package CFClient::UI::Gauge;
1674 1876
1675our @ISA = CFClient::UI::VBox::; 1877our @ISA = CFClient::UI::VBox::;
1676 1878
1677sub new { 1879sub new {
1678 my ($class, %arg) = shift; 1880 my ($class, %arg) = @_;
1679 1881
1680 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
1681 @_, 1883 tooltip => $arg{type},
1884 can_hover => 1,
1885 can_events => 1,
1886 %arg,
1682 ); 1887 );
1683 1888
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1889 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1685 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1890 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1686 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1891 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1892
1688 $self 1893 $self
1689} 1894}
1690 1895
1691sub set_fontsize { 1896sub set_fontsize {
… …
1693 1898
1694 $self->{value}->set_fontsize ($fsize); 1899 $self->{value}->set_fontsize ($fsize);
1695 $self->{max} ->set_fontsize ($fsize); 1900 $self->{max} ->set_fontsize ($fsize);
1696} 1901}
1697 1902
1903sub set_max {
1904 my ($self, $max) = @_;
1905
1906 $self->{gauge}->set_max ($max);
1907 $self->{max}->set_text ($max);
1908}
1909
1698sub set_value { 1910sub set_value {
1699 my ($self, $val, $max) = @_; 1911 my ($self, $val, $max) = @_;
1700 1912
1701 $self->set_max ($max) 1913 $self->set_max ($max)
1702 if defined $max; 1914 if defined $max;
1703 1915
1704 $self->{gauge}->set_value ($val, $max); 1916 $self->{gauge}->set_value ($val, $max);
1705 $self->{value}->set_text ($val); 1917 $self->{value}->set_text ($val);
1706}
1707
1708sub set_max {
1709 my ($self, $max) = @_;
1710
1711 $self->{gauge}->set_max ($max);
1712 $self->{max}->set_text ($max);
1713} 1918}
1714 1919
1715############################################################################# 1920#############################################################################
1716 1921
1717package CFClient::UI::Slider; 1922package CFClient::UI::Slider;
… …
1857 2062
1858sub new { 2063sub new {
1859 my $class = shift; 2064 my $class = shift;
1860 2065
1861 my $self = $class->SUPER::new ( 2066 my $self = $class->SUPER::new (
1862 fontsize => 1, 2067 fontsize => 1,
2068 can_events => 0,
2069 #font => default_font
1863 @_, 2070 @_,
1864 2071
1865 layout => (new CFClient::Layout), 2072 layout => (new CFClient::Layout),
1866 par => [], 2073 par => [],
1867 height => 0, 2074 height => 0,
1868 children => [ 2075 children => [
1869 (new CFClient::UI::Empty expand => 1), 2076 (new CFClient::UI::Empty expand => 1),
1870 (new CFClient::UI::Slider vertical => 1), 2077 (new CFClient::UI::Slider vertical => 1),
1871 ], 2078 ],
1872 ); 2079 );
1873 2080
… …
1907sub size_allocate { 2114sub size_allocate {
1908 my ($self, $w, $h) = @_; 2115 my ($self, $w, $h) = @_;
1909 2116
1910 $self->SUPER::size_allocate ($w, $h); 2117 $self->SUPER::size_allocate ($w, $h);
1911 2118
2119 $self->{layout}->set_font ($self->{font}) if $self->{font};
1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $self->{layout}->set_width ($self->{children}[0]{w}); 2121 $self->{layout}->set_width ($self->{children}[0]{w});
1914 2122
1915 $self->reflow; 2123 $self->reflow;
1916} 2124}
… …
1969 2177
1970 my $y = 0; 2178 my $y = 0;
1971 2179
1972 my $layout = $self->{layout}; 2180 my $layout = $self->{layout};
1973 2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183
1974 for my $par (@{$self->{par}}) { 2184 for my $par (@{$self->{par}}) {
1975 my $h = $par->[0]; 2185 my $h = $par->[0];
1976 2186
1977 if ($y0 < $y + $h && $y < $y1) { 2187 if ($y0 < $y + $h && $y < $y1) {
1978 $layout->set_text ($par->[2]); 2188 $layout->set_text ($par->[2]);
… …
1995 my ($self) = @_; 2205 my ($self) = @_;
1996 2206
1997 if ($self->{texture}) { 2207 if ($self->{texture}) {
1998 glEnable GL_TEXTURE_2D; 2208 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1;
2000 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2001 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
2002 } 2213 }
2003 2214
2004 $self->{children}[1]->draw; 2215 $self->{children}[1]->draw;
… …
2055 2266
2056sub new { 2267sub new {
2057 my $class = shift; 2268 my $class = shift;
2058 2269
2059 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
2060 state => 0, 2271 state => 0,
2061 connect_activate => \&toggle_flopper, 2272 connect_activate => \&toggle_flopper,
2062 @_ 2273 @_
2063 ); 2274 );
2064 2275
2065 if ($self->{state}) { 2276 if ($self->{state}) {
… …
2086 $self->emit (changed => $self->{state}); 2297 $self->emit (changed => $self->{state});
2087} 2298}
2088 2299
2089############################################################################# 2300#############################################################################
2090 2301
2302package CFClient::UI::Tooltip;
2303
2304our @ISA = CFClient::UI::Bin::;
2305
2306use CFClient::OpenGL;
2307
2308sub new {
2309 my $class = shift;
2310
2311 $class->SUPER::new (
2312 @_,
2313 can_events => 0,
2314 )
2315}
2316
2317sub set_markup {
2318 my ($self, $text) = @_;
2319
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2321 $self->{label}->set_markup ($text);
2322 $self->add ($self->{label});
2323}
2324
2325sub size_request {
2326 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331
2332 ($w + 4, $h + 4)
2333}
2334
2335sub size_allocate {
2336 my ($self, $w, $h) = @_;
2337
2338 $self->SUPER::size_allocate ($w - 4, $h - 4);
2339}
2340
2341sub _draw {
2342 my ($self) = @_;
2343
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375;
2346
2347 my ($w, $h) = @$self{qw(w h)};
2348
2349 glColor 1, 0.8, 0.4;
2350 glBegin GL_QUADS;
2351 glVertex 0 , 0;
2352 glVertex 0 , $h;
2353 glVertex $w, $h;
2354 glVertex $w, 0;
2355 glEnd;
2356
2357 glColor 0, 0, 0;
2358 glBegin GL_LINE_LOOP;
2359 glVertex 0 , 0;
2360 glVertex 0 , $h;
2361 glVertex $w, $h;
2362 glVertex $w, 0;
2363 glEnd;
2364
2365 glPopMatrix;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw;
2369}
2370
2371#############################################################################
2372
2373package CFClient::UI::Face;
2374
2375our @ISA = CFClient::UI::Base::;
2376
2377use CFClient::OpenGL;
2378
2379sub new {
2380 my $class = shift;
2381
2382 $class->SUPER::new (
2383 aspect => 1,
2384 @_,
2385 )
2386}
2387
2388sub size_request {
2389 (32, 8)
2390}
2391
2392sub draw {
2393 my ($self) = @_;
2394
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396
2397 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 }
2407}
2408
2409#############################################################################
2410
2091package CFClient::UI::Root; 2411package CFClient::UI::Root;
2092 2412
2093our @ISA = CFClient::UI::Container::; 2413our @ISA = CFClient::UI::Container::;
2094 2414
2095use CFClient::OpenGL; 2415use CFClient::OpenGL;
… …
2170############################################################################# 2490#############################################################################
2171 2491
2172package CFClient::UI; 2492package CFClient::UI;
2173 2493
2174$ROOT = new CFClient::UI::Root; 2494$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip;
2175 2496
21761 24971
2177 2498

Diff Legend

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