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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.178 by root, Tue Apr 25 13:51:48 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
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 my ($w, $h) = $self->size_request; 405 $self->{parent}
406 or return 1;
300 407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 413 $self->{req_w} = $w;
303 $self->{req_h} = $h; 414 $self->{req_h} = $h;
304 415
305 $self->{parent}->check_size 416 $self->{parent}->check_size
306 if $self->{parent}; 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
307 } 425 }
308} 426}
309 427
310sub update { 428sub update {
311 my ($self) = @_; 429 my ($self) = @_;
… …
321} 439}
322 440
323sub emit { 441sub emit {
324 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
325 443
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 445}
330 446
331sub DESTROY { 447sub DESTROY {
332 my ($self) = @_; 448 my ($self) = @_;
333 449
… …
378 494
379package CFClient::UI::Empty; 495package CFClient::UI::Empty;
380 496
381our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
382 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
383sub size_request { 504sub size_request {
384 (0, 0) 505 (0, 0)
385} 506}
386 507
387sub draw { } 508sub draw { }
… …
395sub new { 516sub new {
396 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
397 518
398 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
399 520
400 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
401 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
402 527
403 $self 528 $self
404} 529}
405 530
… …
416 ]; 541 ];
417 542
418 $child->check_size; 543 $child->check_size;
419} 544}
420 545
546sub children {
547 @{ $_[0]{children} }
548}
549
421sub remove { 550sub remove {
422 my ($self, $child) = @_; 551 my ($self, $child) = @_;
423 552
424 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
425 555
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 557
428 $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 }
429} 572}
430 573
431sub find_widget { 574sub find_widget {
432 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
433 576
… …
508} 651}
509 652
510sub update { 653sub update {
511 my ($self) = @_; 654 my ($self) = @_;
512 655
513 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 657 $self->SUPER::update;
516} 658}
517 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
518sub render_chld { 667sub render_child {
519 my ($self) = @_; 668 my ($self) = @_;
520 669
521 $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 {
522 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
523 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
524 $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;
525 }; 681 };
526}
527
528sub size_allocate {
529 my ($self, $w, $h) = @_;
530
531 $self->child->configure (0, 0, $w, $h);
532
533 $self->render_chld;
534} 682}
535 683
536sub _draw { 684sub _draw {
537 my ($self) = @_; 685 my ($self) = @_;
538 686
… …
540 688
541 my $tex = $self->{texture} 689 my $tex = $self->{texture}
542 or return; 690 or return;
543 691
544 glEnable GL_BLEND; 692 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
547 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;
548 697
549 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
550 699
551 glDisable GL_BLEND; 700 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
561sub new { die } 710sub new { die }
562 711
563sub size_request { 712sub size_request {
564 my ($self) = @_; 713 my ($self) = @_;
565 714
566 @$self{qw(child_w child_h)} = $self->child->size_request; 715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 717
569 @$self{qw(child_w child_h)} 718 @$self{qw(child_w child_h)}
570} 719}
571 720
… …
593 border => 0.8, 742 border => 0.8,
594 @_ 743 @_
595 ); 744 );
596 745
597 $self 746 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605}
606
607sub size_request {
608 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h})
610}
611
612sub size_allocate {
613 my ($self, $w, $h) = @_;
614 $self->{w} = $w;
615 $self->{h} = $h;
616 $self->child->configure (0, 0, $w, $h);
617} 747}
618 748
619sub _draw { 749sub _draw {
620 my ($self) = @_; 750 my ($self) = @_;
621 751
… …
656 my $class = shift; 786 my $class = shift;
657 787
658 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
659 789
660 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
663 border => 0.8, 793 border => 0.6,
794 can_events => 1,
664 @_ 795 @_
665 ); 796 );
666 797
667 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 799 align => 0,
669 valign => 1, 800 valign => 1,
670 text => $self->{title}, 801 text => $self->{title},
671 fontsize => 1; 802 fontsize => $self->{border};
672 803
673 $self 804 $self
674} 805}
675 806
676sub border { 807sub border {
677 int $_[0]{border} * $::FONTSIZE 808 int $_[0]{border} * $::FONTSIZE
678} 809}
679 810
680sub size_request { 811sub size_request {
681 my ($self) = @_; 812 my ($self) = @_;
682
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684 813
685 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
686 815
687 ( 816 (
688 $w + $self->border * 2, 817 $w + $self->border * 2,
… …
703} 832}
704 833
705sub button_down { 834sub button_down {
706 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
707 836
837 my ($w, $h) = @$self{qw(w h)};
708 my $border = $self->border; 838 my $border = $self->border;
709 839
710 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
713 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
714 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
715 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
716 $self->{motion} = sub { 851 $self->{motion} = sub {
717 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
718 853
719 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
720 856
721 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
722 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
723 $self->check_size; 860 $self->check_size;
724 }; 861 };
725 862
726 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
727 && $y >= 0 && $y < $border) {
728
729 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
730 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
731 866
732 $self->{motion} = sub { 867 $self->{motion} = sub {
733 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
769 $tex[1]->draw_quad (0, 0, $w, $border); 904 $tex[1]->draw_quad (0, 0, $w, $border);
770 $tex[3]->draw_quad (0, $border, $border, $ch); 905 $tex[3]->draw_quad (0, $border, $border, $ch);
771 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
772 $tex[4]->draw_quad (0, $h - $border, $w, $border); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
773 908
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
774 my $bg = $tex[0]; 910 my $bg = $tex[0];
775 911
776 # TODO: repeat texture not scale 912 # TODO: repeat texture not scale
777 my $rep_x = $cw / $bg->{w}; 913 my $rep_x = $cw / $bg->{w};
778 my $rep_y = $ch / $bg->{h}; 914 my $rep_y = $ch / $bg->{h};
779 915
780 glColor @{ $self->{bg} }; 916 glColor @{ $self->{bg} };
781 917
782 $bg->{s} = $rep_x; 918 $bg->{s} = $rep_x;
783 $bg->{t} = $rep_y; 919 $bg->{t} = $rep_y;
784 $bg->{wrap_mode} = 1; 920 $bg->{wrap_mode} = 1;
785 $bg->draw_quad ($border, $border, $cw, $ch); 921 $bg->draw_quad ($border, $border, $cw, $ch);
786 922
787 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
788 glDisable GL_BLEND; 924 glDisable GL_BLEND;
925 }
789 926
790 $self->{title}->draw if $self->{title}; 927 $self->{title}->draw if $self->{title};
928
791 $self->child->draw; 929 $self->child->draw;
792} 930}
793 931
794############################################################################# 932#############################################################################
795 933
… …
817 $self->{children}[$y][$x] = $child; 955 $self->{children}[$y][$x] = $child;
818 956
819 $child->check_size; 957 $child->check_size;
820} 958}
821 959
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
822# TODO: move to container class maybe? send childs a signal on removal? 964# TODO: move to container class maybe? send childs a signal on removal?
823sub clear { 965sub clear {
824 my ($self) = @_; 966 my ($self) = @_;
825 967
968 my @children = $self->children;
826 delete $self->{children}; 969 delete $self->{children};
970
971 for (@children) {
972 delete $_->{parent};
973 $_->hide;
974 }
975
827 $self->update; 976 $self->update;
828} 977}
829 978
830sub get_wh { 979sub get_wh {
831 my ($self) = @_; 980 my ($self) = @_;
… …
837 or next; 986 or next;
838 987
839 for my $x (0 .. $#$row) { 988 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 989 my $widget = $row->[$x]
841 or next; 990 or next;
842 my ($w, $h) = $widget->size_request; 991 my ($w, $h) = @$widget{qw(req_w req_h)};
843 992
844 $w[$x] = max $w[$x], $w; 993 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 994 $h[$y] = max $h[$y], $h;
846 } 995 }
847 } 996 }
… …
952 1101
953 ($h, $w) = ($w, $h); 1102 ($h, $w) = ($w, $h);
954 1103
955 my $children = $self->{children}; 1104 my $children = $self->{children};
956 1105
957 my @h = map +($_->size_request)[0], @$children; 1106 my @h = map $_->{req_w}, @$children;
958 1107
959 my $req_h = List::Util::sum @h; 1108 my $req_h = List::Util::sum @h;
960 1109
961 if ($req_h > $h) { 1110 if ($req_h > $h) {
962 # ah well, not enough space 1111 # ah well, not enough space
… …
1010sub size_allocate { 1159sub size_allocate {
1011 my ($self, $w, $h) = @_; 1160 my ($self, $w, $h) = @_;
1012 1161
1013 my $children = $self->{children}; 1162 my $children = $self->{children};
1014 1163
1015 my @h = map +($_->size_request)[1], @$children; 1164 my @h = map $_->{req_h}, @$children;
1016 1165
1017 my $req_h = List::Util::sum @h; 1166 my $req_h = List::Util::sum @h;
1018 1167
1019 if ($req_h > $h) { 1168 if ($req_h > $h) {
1020 # ah well, not enough space 1169 # ah well, not enough space
… …
1054 1203
1055sub new { 1204sub new {
1056 my ($class, %arg) = @_; 1205 my ($class, %arg) = @_;
1057 1206
1058 my $self = $class->SUPER::new ( 1207 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1208 fg => [1, 1, 1],
1209 #font => default_font
1060 fontsize => 1, 1210 fontsize => 1,
1061 text => "", 1211 text => "",
1062 align => -1, 1212 align => -1,
1063 valign => -1, 1213 valign => -1,
1064 padding => 2, 1214 padding => 2,
1065 layout => new CFClient::Layout, 1215 layout => new CFClient::Layout,
1216 can_events => 0,
1066 %arg 1217 %arg
1067 ); 1218 );
1068 1219
1069 if (exists $self->{template}) { 1220 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1221 my $layout = new CFClient::Layout;
… …
1076 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1077 1228
1078 $self 1229 $self
1079} 1230}
1080 1231
1081sub escape_text { 1232sub escape {
1082 local $_ = $_[1]; 1233 local $_ = $_[1];
1083 1234
1084 s/&/&amp;/g; 1235 s/&/&amp;/g;
1085 s/>/&gt;/g; 1236 s/>/&gt;/g;
1086 s/</&lt;/g; 1237 s/</&lt;/g;
1087 1238
1088 $_[1] 1239 $_[1]
1089} 1240}
1090 1241
1242sub update {
1243 my ($self) = @_;
1244
1245 delete $self->{texture};
1246 $self->SUPER::update;
1247}
1248
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1091sub set_text { 1255sub set_text {
1092 my ($self, $text) = @_; 1256 my ($self, $text) = @_;
1093 1257
1258 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text";
1260
1094 $self->{layout}->set_text ($text); 1261 $self->{layout}->set_text ($text);
1095 1262
1096 delete $self->{texture}; 1263 delete $self->{texture};
1097 $self->update; 1264 $self->update;
1265 $self->check_size;
1098} 1266}
1099 1267
1100sub set_markup { 1268sub set_markup {
1101 my ($self, $markup) = @_; 1269 my ($self, $markup) = @_;
1102 1270
1271 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup";
1273
1103 $self->{layout}->set_markup ($markup); 1274 $self->{layout}->set_markup ($markup);
1104 1275
1105 delete $self->{texture}; 1276 delete $self->{texture};
1106 $self->update; 1277 $self->update;
1278 $self->check_size;
1107} 1279}
1108 1280
1109sub size_request { 1281sub size_request {
1110 my ($self) = @_; 1282 my ($self) = @_;
1111 1283
1112 $self->{layout}->set_width; 1284 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1);
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1287
1115 my ($w, $h) = $self->{layout}->size; 1288 my ($w, $h) = $self->{layout}->size;
1116 1289
1117 if (exists $self->{template}) { 1290 if (exists $self->{template}) {
1291 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1292 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1293
1120 my ($w2, $h2) = $self->{template}->size; 1294 my ($w2, $h2) = $self->{template}->size;
1121 1295
1122 $w = List::Util::max $w, $w2; 1296 $w = List::Util::max $w, $w2;
… …
1137 1311
1138sub set_fontsize { 1312sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1313 my ($self, $fontsize) = @_;
1140 1314
1141 $self->{fontsize} = $fontsize; 1315 $self->{fontsize} = $fontsize;
1316 delete $self->{texture};
1142 $self->check_size; 1317 $self->check_size;
1318 $self->update;
1143} 1319}
1144 1320
1145sub _draw { 1321sub _draw {
1146 my ($self) = @_; 1322 my ($self) = @_;
1147 1323
1148 my $tex = $self->{texture} ||= do { 1324 my $tex = $self->{texture} ||= do {
1325 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $self->{layout}->set_width ($self->{w}); 1326 $self->{layout}->set_width ($self->{w});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1151 new_from_layout CFClient::Texture $self->{layout} 1328 new_from_layout CFClient::Texture $self->{layout}
1152 }; 1329 };
1153 1330
… …
1186 1363
1187sub new { 1364sub new {
1188 my $class = shift; 1365 my $class = shift;
1189 1366
1190 $class->SUPER::new ( 1367 $class->SUPER::new (
1191 fg => [1, 1, 1], 1368 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1369 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1370 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1371 active_fg => [0, 0, 0],
1195 can_hover => 1, 1372 can_hover => 1,
1196 can_focus => 1, 1373 can_focus => 1,
1197 valign => 0, 1374 valign => 0,
1375 can_events => 1,
1198 @_ 1376 @_
1199 ) 1377 )
1200} 1378}
1201 1379
1202sub _set_text { 1380sub _set_text {
… …
1230} 1408}
1231 1409
1232sub size_allocate { 1410sub size_allocate {
1233 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1234 1412
1235 $self->_set_text ($self->{text}); 1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236} 1414}
1237 1415
1238sub set_text { 1416sub set_text {
1239 my ($self, $text) = @_; 1417 my ($self, $text) = @_;
1240 1418
… …
1355 my ($self, $ev) = @_; 1533 my ($self, $ev) = @_;
1356 1534
1357 my $sym = $ev->{sym}; 1535 my $sym = $ev->{sym};
1358 1536
1359 if ($sym == 13) { 1537 if ($sym == 13) {
1538 unshift @{$self->{history}},
1539 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1542 $self->emit (activate => $txt);
1361 $self->update; 1543 $self->update;
1544
1545 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text;
1548 }
1549 if (@{$self->{history} || []} > 0) {
1550 $self->{history_pointer}++;
1551 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1552 $self->{history_pointer} = @{$self->{history} || []} - 1;
1553 }
1554 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1555 }
1556
1557 } elsif ($sym == CFClient::SDLK_DOWN) {
1558 $self->{history_pointer}--;
1559 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1560
1561 if ($self->{history_pointer} >= 0) {
1562 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1563 } else {
1564 $self->set_text ($self->{history_saveback});
1565 }
1362 1566
1363 } else { 1567 } else {
1364 $self->SUPER::key_down ($ev); 1568 $self->SUPER::key_down ($ev);
1365 } 1569 }
1366 1570
… …
1380 1584
1381sub new { 1585sub new {
1382 my $class = shift; 1586 my $class = shift;
1383 1587
1384 $class->SUPER::new ( 1588 $class->SUPER::new (
1385 padding => 4, 1589 padding => 4,
1386 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2], 1591 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1592 active_fg => [0, 0, 1],
1389 can_hover => 1, 1593 can_hover => 1,
1390 align => 0, 1594 align => 0,
1391 valign => 0, 1595 valign => 0,
1596 can_events => 1,
1392 @_ 1597 @_
1393 ) 1598 )
1394} 1599}
1395 1600
1396sub button_up { 1601sub button_up {
… …
1501our %loaded_images; 1706our %loaded_images;
1502 1707
1503sub new { 1708sub new {
1504 my $class = shift; 1709 my $class = shift;
1505 1710
1506 my $self = $class->SUPER::new (@_); 1711 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1712
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1713 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1714
1510 $loaded_images{$self->{image}} ||= 1715 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1716 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1553############################################################################# 1758#############################################################################
1554 1759
1555package CFClient::UI::VGauge; 1760package CFClient::UI::VGauge;
1556 1761
1557our @ISA = CFClient::UI::Base::; 1762our @ISA = CFClient::UI::Base::;
1763
1764use List::Util qw(min max);
1558 1765
1559use CFClient::OpenGL; 1766use CFClient::OpenGL;
1560 1767
1561my %tex = ( 1768my %tex = (
1562 food => [ 1769 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1770 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1771 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1772 ],
1566 grace => [ 1773 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1774 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1775 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1776 ],
1570 hp => [ 1777 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1778 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1779 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1780 ],
1574 mana => [ 1781 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1783 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1784 ],
1578); 1785);
1579 1786
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 1787# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 1788sub new {
… …
1600} 1807}
1601 1808
1602sub set_max { 1809sub set_max {
1603 my ($self, $max) = @_; 1810 my ($self, $max) = @_;
1604 1811
1812 return if $self->{max_val} == $max;
1813
1605 $self->{max_val} = $max; 1814 $self->{max_val} = $max;
1815 $self->update;
1606} 1816}
1607 1817
1608sub set_value { 1818sub set_value {
1609 my ($self, $val, $max) = @_; 1819 my ($self, $val, $max) = @_;
1610 1820
1611 $self->set_max ($max) 1821 $self->set_max ($max)
1612 if defined $max; 1822 if defined $max;
1613 1823
1614 $max = $self->{max_val}; 1824 return if $self->{val} == $val;
1825
1615 $self->{val} = $val; 1826 $self->{val} = $val;
1616
1617 $self->update; 1827 $self->update;
1618} 1828}
1619 1829
1620sub _draw { 1830sub _draw {
1621 my ($self) = @_; 1831 my ($self) = @_;
1622 1832
1623 my $tex = $tex{$self->{type}}; 1833 my $tex = $tex{$self->{type}};
1834 my ($t1, $t2, $t3) = @$tex;
1624 1835
1625 my ($w, $h) = ($self->{w}, $self->{h}); 1836 my ($w, $h) = ($self->{w}, $self->{h});
1626 1837
1627 if ($self->{vertical}) { 1838 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 1839 glRotate 90, 0, 0, 1;
… …
1630 1841
1631 ($w, $h) = ($h, $w); 1842 ($w, $h) = ($h, $w);
1632 } 1843 }
1633 1844
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 1845 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 1846
1637 my $t1 = $tex->[0]; 1847 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 1848 my $ycut2 = max 0, min 1, $ycut - 1;
1849
1850 my $h1 = $self->{h} * (1 - $ycut1);
1851 my $h2 = $self->{h} * (1 - $ycut2);
1639 1852
1640 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 1855 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1856 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 1857
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1858 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 1859 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 1860 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1861 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1862 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1863 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 1864 glEnd;
1655 1865
1866 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1867 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 1868 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1869 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1870 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1871 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1872 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 1873 glEnd;
1874
1875 if ($t3) {
1876 glBindTexture GL_TEXTURE_2D, $t3->{name};
1877 glBegin GL_QUADS;
1878 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1879 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1880 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1881 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1882 glEnd;
1883 }
1663 1884
1664 glDisable GL_BLEND; 1885 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 1886 glDisable GL_TEXTURE_2D;
1666} 1887}
1667 1888
… …
1670package CFClient::UI::Gauge; 1891package CFClient::UI::Gauge;
1671 1892
1672our @ISA = CFClient::UI::VBox::; 1893our @ISA = CFClient::UI::VBox::;
1673 1894
1674sub new { 1895sub new {
1675 my ($class, %arg) = shift; 1896 my ($class, %arg) = @_;
1676 1897
1677 my $self = $class->SUPER::new ( 1898 my $self = $class->SUPER::new (
1678 @_, 1899 tooltip => $arg{type},
1900 can_hover => 1,
1901 can_events => 1,
1902 %arg,
1679 ); 1903 );
1680 1904
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1905 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1906 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1907 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 1908
1685 $self 1909 $self
1686} 1910}
1687 1911
1688sub set_fontsize { 1912sub set_fontsize {
… …
1690 1914
1691 $self->{value}->set_fontsize ($fsize); 1915 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 1916 $self->{max} ->set_fontsize ($fsize);
1693} 1917}
1694 1918
1919sub set_max {
1920 my ($self, $max) = @_;
1921
1922 $self->{gauge}->set_max ($max);
1923 $self->{max}->set_text ($max);
1924}
1925
1695sub set_value { 1926sub set_value {
1696 my ($self, $val, $max) = @_; 1927 my ($self, $val, $max) = @_;
1697 1928
1698 $self->set_max ($max) 1929 $self->set_max ($max)
1699 if defined $max; 1930 if defined $max;
1700 1931
1701 $self->{gauge}->set_value ($val, $max); 1932 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 1933 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 1934}
1711 1935
1712############################################################################# 1936#############################################################################
1713 1937
1714package CFClient::UI::Slider; 1938package CFClient::UI::Slider;
… …
1854 2078
1855sub new { 2079sub new {
1856 my $class = shift; 2080 my $class = shift;
1857 2081
1858 my $self = $class->SUPER::new ( 2082 my $self = $class->SUPER::new (
1859 fontsize => 1, 2083 fontsize => 1,
2084 can_events => 0,
2085 #font => default_font
1860 @_, 2086 @_,
1861 2087
1862 layout => (new CFClient::Layout), 2088 layout => (new CFClient::Layout),
1863 par => [], 2089 par => [],
1864 height => 0, 2090 height => 0,
1865 children => [ 2091 children => [
1866 (new CFClient::UI::Empty expand => 1), 2092 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2093 (new CFClient::UI::Slider vertical => 1),
1868 ], 2094 ],
1869 ); 2095 );
1870 2096
1871 $self->{children}[1]->connect (changed => sub { 2097 $self->{children}[1]->connect (changed => sub { $self->update });
1872 $self->update;
1873 });
1874 2098
1875 $self 2099 $self
1876} 2100}
1877 2101
1878sub set_fontsize { 2102sub set_fontsize {
… …
1886 my ($self, $text) = @_; 2110 my ($self, $text) = @_;
1887 2111
1888 my $layout = $self->{layout}; 2112 my $layout = $self->{layout};
1889 2113
1890 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891 $layout->set_width ($self->{w}); 2115 $layout->set_width ($self->{children}[0]{w});
1892 $layout->set_text ($text); 2116 $layout->set_text ($text);
1893 2117
1894 ($layout->size)[1] 2118 ($layout->size)[1]
1895} 2119}
1896 2120
… …
1904sub size_allocate { 2128sub size_allocate {
1905 my ($self, $w, $h) = @_; 2129 my ($self, $w, $h) = @_;
1906 2130
1907 $self->SUPER::size_allocate ($w, $h); 2131 $self->SUPER::size_allocate ($w, $h);
1908 2132
2133 $self->{layout}->set_font ($self->{font}) if $self->{font};
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2134 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910 $self->{layout}->set_width ($self->{children}[0]{w}); 2135 $self->{layout}->set_width ($self->{children}[0]{w});
1911 2136
1912 $self->reflow; 2137 $self->reflow;
1913} 2138}
… …
1948 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1949 2174
1950 delete $self->{texture}; 2175 delete $self->{texture};
1951 } 2176 }
1952 2177
1953 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1954 glClearColor 0, 0, 0, 1; 2179 glClearColor 0, 0, 0, 0;
1955 glClear GL_COLOR_BUFFER_BIT; 2180 glClear GL_COLOR_BUFFER_BIT;
1956 2181
1957 glEnable GL_BLEND; 2182 glEnable GL_BLEND;
1958 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1959 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
… …
1966 2191
1967 my $y = 0; 2192 my $y = 0;
1968 2193
1969 my $layout = $self->{layout}; 2194 my $layout = $self->{layout};
1970 2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197
1971 for my $par (@{$self->{par}}) { 2198 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2199 my $h = $par->[0];
1973 2200
1974 if ($y0 < $y + $h && $y < $y1) { 2201 if ($y0 < $y + $h && $y < $y1) {
1975 $layout->set_text ($par->[2]); 2202 $layout->set_text ($par->[2]);
… …
1989} 2216}
1990 2217
1991sub _draw { 2218sub _draw {
1992 my ($self) = @_; 2219 my ($self) = @_;
1993 2220
1994 if ($self->{texture}) { 2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1995 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1;
1997 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1998 glDisable GL_TEXTURE_2D; 2227 glDisable GL_TEXTURE_2D;
1999 } 2228 glDisable GL_BLEND;
2000 2229
2001 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2002 2231
2003} 2232}
2004 2233
… …
2052 2281
2053sub new { 2282sub new {
2054 my $class = shift; 2283 my $class = shift;
2055 2284
2056 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2057 state => 0, 2286 state => 0,
2058 connect_activate => \&toggle_flopper, 2287 connect_activate => \&toggle_flopper,
2059 @_ 2288 @_
2060 ); 2289 );
2061 2290
2062 if ($self->{state}) { 2291 if ($self->{state}) {
… …
2083 $self->emit (changed => $self->{state}); 2312 $self->emit (changed => $self->{state});
2084} 2313}
2085 2314
2086############################################################################# 2315#############################################################################
2087 2316
2317package CFClient::UI::Tooltip;
2318
2319our @ISA = CFClient::UI::Bin::;
2320
2321use CFClient::OpenGL;
2322
2323sub new {
2324 my $class = shift;
2325
2326 $class->SUPER::new (
2327 @_,
2328 can_events => 0,
2329 )
2330}
2331
2332sub set_markup {
2333 my ($self, $text) = @_;
2334
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2336 $self->{label}->set_markup ($text);
2337 $self->add ($self->{label});
2338}
2339
2340sub size_request {
2341 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346
2347 ($w + 4, $h + 4)
2348}
2349
2350sub size_allocate {
2351 my ($self, $w, $h) = @_;
2352
2353 $self->SUPER::size_allocate ($w - 4, $h - 4);
2354}
2355
2356sub _draw {
2357 my ($self) = @_;
2358
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375;
2361
2362 my ($w, $h) = @$self{qw(w h)};
2363
2364 glColor 1, 0.8, 0.4;
2365 glBegin GL_QUADS;
2366 glVertex 0 , 0;
2367 glVertex 0 , $h;
2368 glVertex $w, $h;
2369 glVertex $w, 0;
2370 glEnd;
2371
2372 glColor 0, 0, 0;
2373 glBegin GL_LINE_LOOP;
2374 glVertex 0 , 0;
2375 glVertex 0 , $h;
2376 glVertex $w, $h;
2377 glVertex $w, 0;
2378 glEnd;
2379
2380 glPopMatrix;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw;
2384}
2385
2386#############################################################################
2387
2388package CFClient::UI::Face;
2389
2390our @ISA = CFClient::UI::Base::;
2391
2392use CFClient::OpenGL;
2393
2394sub new {
2395 my $class = shift;
2396
2397 $class->SUPER::new (
2398 aspect => 1,
2399 @_,
2400 )
2401}
2402
2403sub size_request {
2404 (32, 8)
2405}
2406
2407sub draw {
2408 my ($self) = @_;
2409
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411
2412 # TODO animation
2413 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 }
2423}
2424
2425#############################################################################
2426
2427package CFClient::UI::Menu;
2428
2429our @ISA = CFClient::UI::FancyFrame::;
2430
2431use CFClient::OpenGL;
2432
2433sub new {
2434 my $class = shift;
2435
2436 my $self = $class->SUPER::new (
2437 items => [],
2438 z => 100,
2439 @_,
2440 );
2441
2442 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2443
2444 for my $item (@{ $self->{items} }) {
2445 my ($widget, $cb) = @$item;
2446
2447 # handle various types of items, only text for now
2448 if (!ref $widget) {
2449 $widget = new CFClient::UI::Label
2450 can_hover => 1,
2451 can_events => 1,
2452 text => $widget;
2453 }
2454
2455 $self->{item}{$widget} = $item;
2456
2457 $self->{vbox}->add ($widget);
2458 }
2459
2460 $self
2461}
2462
2463# popup given the event (must be a mouse button down event currently)
2464sub popup {
2465 my ($self, $ev) = @_;
2466
2467 $self->emit ("popdown");
2468
2469 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self;
2471 $self->{button} = $ev->{button};
2472
2473 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475}
2476
2477sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # TODO: should use vbox->fdind_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER};
2483}
2484
2485sub button_up {
2486 my ($self, $ev, $x, $y) = @_;
2487
2488 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB;
2490 $self->hide;
2491
2492 $self->emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover};
2494 }
2495}
2496
2497#############################################################################
2498
2088package CFClient::UI::Root; 2499package CFClient::UI::Root;
2089 2500
2090our @ISA = CFClient::UI::Container::; 2501our @ISA = CFClient::UI::Container::;
2091 2502
2092use CFClient::OpenGL; 2503use CFClient::OpenGL;
2093 2504
2094sub check_size { 2505sub check_size {
2095 my ($self) = @_; 2506 my ($self) = @_;
2096 2507
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2098} 2509}
2099 2510
2100sub size_request { 2511sub size_request {
2101 ($::WIDTH, $::HEIGHT) 2512 ($::WIDTH, $::HEIGHT)
2102} 2513}
… …
2104sub configure { 2515sub configure {
2105 my ($self, $x, $y, $w, $h) = @_; 2516 my ($self, $x, $y, $w, $h) = @_;
2106 2517
2107 $self->SUPER::configure ($x, $y, $w, $h); 2518 $self->SUPER::configure ($x, $y, $w, $h);
2108 2519
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2110 for @{$self->{children}}; 2520 for my $child (@{$self->{children}}) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2525 $child->configure ($X, $Y, $W,$H);
2526 }
2111} 2527}
2112 2528
2113sub _topleft { 2529sub _topleft {
2114 my ($self, $x, $y) = @_; 2530 my ($self, $x, $y) = @_;
2115 2531
… …
2162############################################################################# 2578#############################################################################
2163 2579
2164package CFClient::UI; 2580package CFClient::UI;
2165 2581
2166$ROOT = new CFClient::UI::Root; 2582$ROOT = new CFClient::UI::Root;
2583$TOOLTIP = new CFClient::UI::Tooltip;
2167 2584
21681 25851
2169 2586

Diff Legend

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