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.143 by root, Thu Apr 20 21:28:51 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,
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 abtract"; 212 Carp::confess "size_request is abstract";
146} 213}
147 214
148sub configure { 215sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 216 my ($self, $x, $y, $w, $h) = @_;
150 217
… …
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 219 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 220 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154 221
155 # use alignment to adjust x, y 222 # use alignment to adjust x, y
156 223
157 $x += ($w - $w2) * 0.5; 224 $x += int +($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5; 225 $y += int +($h - $h2) * 0.5;
159 226
160 ($w, $h) = ($w2, $h2); 227 ($w, $h) = ($w2, $h2);
161 } 228 }
162 229
163 if ($self->{x} != $x || $self->{y} != $y) { 230 if ($self->{x} != $x || $self->{y} != $y) {
… …
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
… …
581package CFClient::UI::Frame; 730package CFClient::UI::Frame;
582 731
583our @ISA = CFClient::UI::Bin::; 732our @ISA = CFClient::UI::Bin::;
584 733
585use CFClient::OpenGL; 734use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 735
633sub new { 736sub new {
634 my $class = shift; 737 my $class = shift;
635
636 # TODO: user_x, user_y, overwrite moveto?
637 738
638 my $self = $class->SUPER::new ( 739 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 740 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 741 border_bg => [1, 1, 1, 1],
641 border => 0.8, 742 border => 0.8,
642 @_ 743 @_
643 ); 744 );
644 745
746 $self
747}
748
749sub _draw {
750 my ($self) = @_;
751
752 my ($w, $h) = ($self->{w}, $self->{h});
753
754 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758
759# glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766
767
768 $self->child->draw;
769 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D;
771}
772
773#############################################################################
774
775package CFClient::UI::FancyFrame;
776
777our @ISA = CFClient::UI::Bin::;
778
779use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784
785sub new {
786 my $class = shift;
787
788 # TODO: user_x, user_y, overwrite moveto?
789
790 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1],
793 border => 0.8,
794 can_events => 1,
795 @_
796 );
797
645 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 799 align => 0,
647 valign => 1, 800 valign => 1,
648 text => $self->{title}, 801 text => $self->{title},
649 fontsize => 1; 802 fontsize => 1;
… …
656} 809}
657 810
658sub size_request { 811sub size_request {
659 my ($self) = @_; 812 my ($self) = @_;
660 813
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
664 815
665 ( 816 (
666 $w + $self->border * 2, 817 $w + $self->border * 2,
667 $h + $self->border * 2, 818 $h + $self->border * 2,
… …
795 $self->{children}[$y][$x] = $child; 946 $self->{children}[$y][$x] = $child;
796 947
797 $child->check_size; 948 $child->check_size;
798} 949}
799 950
951sub children {
952 grep $_, map @$_, grep $_, @{ $_[0]{children} }
953}
954
800# 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?
801sub clear { 956sub clear {
802 my ($self) = @_; 957 my ($self) = @_;
803 958
959 my @children = $self->children;
804 delete $self->{children}; 960 delete $self->{children};
961
962 for (@children) {
963 delete $_->{parent};
964 $_->hide;
965 }
966
805 $self->update; 967 $self->update;
806} 968}
807 969
808sub get_wh { 970sub get_wh {
809 my ($self) = @_; 971 my ($self) = @_;
… …
815 or next; 977 or next;
816 978
817 for my $x (0 .. $#$row) { 979 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 980 my $widget = $row->[$x]
819 or next; 981 or next;
820 my ($w, $h) = $widget->size_request; 982 my ($w, $h) = @$widget{qw(req_w req_h)};
821 983
822 $w[$x] = max $w[$x], $w; 984 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 985 $h[$y] = max $h[$y], $h;
824 } 986 }
825 } 987 }
… …
930 1092
931 ($h, $w) = ($w, $h); 1093 ($h, $w) = ($w, $h);
932 1094
933 my $children = $self->{children}; 1095 my $children = $self->{children};
934 1096
935 my @h = map +($_->size_request)[0], @$children; 1097 my @h = map $_->{req_w}, @$children;
936 1098
937 my $req_h = List::Util::sum @h; 1099 my $req_h = List::Util::sum @h;
938 1100
939 if ($req_h > $h) { 1101 if ($req_h > $h) {
940 # ah well, not enough space 1102 # ah well, not enough space
… …
988sub size_allocate { 1150sub size_allocate {
989 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
990 1152
991 my $children = $self->{children}; 1153 my $children = $self->{children};
992 1154
993 my @h = map +($_->size_request)[1], @$children; 1155 my @h = map $_->{req_h}, @$children;
994 1156
995 my $req_h = List::Util::sum @h; 1157 my $req_h = List::Util::sum @h;
996 1158
997 if ($req_h > $h) { 1159 if ($req_h > $h) {
998 # ah well, not enough space 1160 # ah well, not enough space
… …
1032 1194
1033sub new { 1195sub new {
1034 my ($class, %arg) = @_; 1196 my ($class, %arg) = @_;
1035 1197
1036 my $self = $class->SUPER::new ( 1198 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1199 fg => [1, 1, 1],
1200 #font => default_font
1038 fontsize => 1, 1201 fontsize => 1,
1039 text => "", 1202 text => "",
1040 align => -1, 1203 align => -1,
1041 valign => -1, 1204 valign => -1,
1042 padding => 2, 1205 padding => 2,
1043 layout => new CFClient::Layout, 1206 layout => new CFClient::Layout,
1207 can_events => 0,
1044 %arg 1208 %arg
1045 ); 1209 );
1046 1210
1047 if (exists $self->{template}) { 1211 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1212 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1218 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1219
1056 $self 1220 $self
1057} 1221}
1058 1222
1059sub escape_text { 1223sub escape {
1060 local $_ = $_[1]; 1224 local $_ = $_[1];
1061 1225
1062 s/&/&amp;/g; 1226 s/&/&amp;/g;
1063 s/>/&gt;/g; 1227 s/>/&gt;/g;
1064 s/</&lt;/g; 1228 s/</&lt;/g;
1065 1229
1066 $_[1] 1230 $_[1]
1067} 1231}
1068 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
1069sub set_text { 1246sub set_text {
1070 my ($self, $text) = @_; 1247 my ($self, $text) = @_;
1071 1248
1249 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text";
1251
1072 $self->{layout}->set_text ($text); 1252 $self->{layout}->set_text ($text);
1073 1253
1074 delete $self->{texture}; 1254 delete $self->{texture};
1075 $self->update; 1255 $self->update;
1256 $self->check_size;
1076} 1257}
1077 1258
1078sub set_markup { 1259sub set_markup {
1079 my ($self, $markup) = @_; 1260 my ($self, $markup) = @_;
1080 1261
1262 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup";
1264
1081 $self->{layout}->set_markup ($markup); 1265 $self->{layout}->set_markup ($markup);
1082 1266
1083 delete $self->{texture}; 1267 delete $self->{texture};
1084 $self->update; 1268 $self->update;
1269 $self->check_size;
1085} 1270}
1086 1271
1087sub size_request { 1272sub size_request {
1088 my ($self) = @_; 1273 my ($self) = @_;
1089 1274
1090 $self->{layout}->set_width; 1275 $self->{layout}->set_font ($self->{font}) if $self->{font};
1276 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1277 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1278
1093 my ($w, $h) = $self->{layout}->size; 1279 my ($w, $h) = $self->{layout}->size;
1094 1280
1095 if (exists $self->{template}) { 1281 if (exists $self->{template}) {
1282 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1283 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1284
1098 my ($w2, $h2) = $self->{template}->size; 1285 my ($w2, $h2) = $self->{template}->size;
1099 1286
1100 $w = List::Util::max $w, $w2; 1287 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1298 my ($self, $w, $h) = @_;
1112 1299
1113 delete $self->{texture}; 1300 delete $self->{texture};
1114} 1301}
1115 1302
1303sub set_fontsize {
1304 my ($self, $fontsize) = @_;
1305
1306 $self->{fontsize} = $fontsize;
1307 delete $self->{texture};
1308 $self->check_size;
1309 $self->update;
1310}
1311
1116sub _draw { 1312sub _draw {
1117 my ($self) = @_; 1313 my ($self) = @_;
1118 1314
1119 my $tex = $self->{texture} ||= do { 1315 my $tex = $self->{texture} ||= do {
1316 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1317 $self->{layout}->set_width ($self->{w});
1121 $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);
1122 new_from_layout CFClient::Texture $self->{layout} 1319 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1320 };
1124 1321
… …
1157 1354
1158sub new { 1355sub new {
1159 my $class = shift; 1356 my $class = shift;
1160 1357
1161 $class->SUPER::new ( 1358 $class->SUPER::new (
1162 fg => [1, 1, 1], 1359 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1360 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1361 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1362 active_fg => [0, 0, 0],
1166 can_hover => 1, 1363 can_hover => 1,
1167 can_focus => 1, 1364 can_focus => 1,
1168 valign => 0, 1365 valign => 0,
1366 can_events => 1,
1169 @_ 1367 @_
1170 ) 1368 )
1171} 1369}
1172 1370
1173sub _set_text { 1371sub _set_text {
… …
1201} 1399}
1202 1400
1203sub size_allocate { 1401sub size_allocate {
1204 my ($self, $w, $h) = @_; 1402 my ($self, $w, $h) = @_;
1205 1403
1206 $self->_set_text ($self->{text}); 1404 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1405}
1208 1406
1209sub set_text { 1407sub set_text {
1210 my ($self, $text) = @_; 1408 my ($self, $text) = @_;
1211 1409
… …
1326 my ($self, $ev) = @_; 1524 my ($self, $ev) = @_;
1327 1525
1328 my $sym = $ev->{sym}; 1526 my $sym = $ev->{sym};
1329 1527
1330 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} = '';
1331 $self->emit (activate => $self->get_text); 1533 $self->emit (activate => $txt);
1332 $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 }
1333 1557
1334 } else { 1558 } else {
1335 $self->SUPER::key_down ($ev); 1559 $self->SUPER::key_down ($ev);
1336 } 1560 }
1337 1561
… …
1344our @ISA = CFClient::UI::Label::; 1568our @ISA = CFClient::UI::Label::;
1345 1569
1346use CFClient::OpenGL; 1570use CFClient::OpenGL;
1347 1571
1348my @tex = 1572my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1573 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1574 qw(b1_button_active.png);
1351 1575
1352sub new { 1576sub new {
1353 my $class = shift; 1577 my $class = shift;
1354 1578
1355 $class->SUPER::new ( 1579 $class->SUPER::new (
1356 padding => 4, 1580 padding => 4,
1357 fg => [1, 1, 1], 1581 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1582 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1583 active_fg => [0, 0, 1],
1360 can_hover => 1, 1584 can_hover => 1,
1361 align => 0, 1585 align => 0,
1362 valign => 0, 1586 valign => 0,
1587 can_events => 1,
1363 @_ 1588 @_
1364 ) 1589 )
1365} 1590}
1366 1591
1367sub button_up { 1592sub button_up {
… …
1401package CFClient::UI::CheckBox; 1626package CFClient::UI::CheckBox;
1402 1627
1403our @ISA = CFClient::UI::DrawBG::; 1628our @ISA = CFClient::UI::DrawBG::;
1404 1629
1405my @tex = 1630my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1631 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1632 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1633
1409use CFClient::OpenGL; 1634use CFClient::OpenGL;
1410 1635
1411sub new { 1636sub new {
… …
1460 glDisable GL_BLEND; 1685 glDisable GL_BLEND;
1461} 1686}
1462 1687
1463############################################################################# 1688#############################################################################
1464 1689
1690package CFClient::UI::Image;
1691
1692our @ISA = CFClient::UI::Base::;
1693
1694use CFClient::OpenGL;
1695use Carp qw/confess/;
1696
1697our %loaded_images;
1698
1699sub new {
1700 my $class = shift;
1701
1702 my $self = $class->SUPER::new (can_events => 0, @_);
1703
1704 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1705
1706 $loaded_images{$self->{image}} ||=
1707 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1708
1709 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1710
1711 Scalar::Util::weaken $loaded_images{$self->{image}};
1712
1713 $self->{aspect} = $tex->{w} / $tex->{h};
1714
1715 $self
1716}
1717
1718sub size_request {
1719 my ($self) = @_;
1720
1721 ($self->{tex}->{w}, $self->{tex}->{h})
1722}
1723
1724sub _draw {
1725 my ($self) = @_;
1726
1727 my $tex = $self->{tex};
1728
1729 my ($w, $h) = ($self->{w}, $self->{h});
1730
1731 if ($self->{rot90}) {
1732 glRotate 90, 0, 0, 1;
1733 glTranslate 0, -$self->{w}, 0;
1734
1735 ($w, $h) = ($h, $w);
1736 }
1737
1738 glEnable GL_BLEND;
1739 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1740 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742
1743 $tex->draw_quad (0, 0, $w, $h);
1744
1745 glDisable GL_BLEND;
1746 glDisable GL_TEXTURE_2D;
1747}
1748
1749#############################################################################
1750
1465package CFClient::UI::VGauge; 1751package CFClient::UI::VGauge;
1466 1752
1467our @ISA = CFClient::UI::Base::; 1753our @ISA = CFClient::UI::Base::;
1754
1755use List::Util qw(min max);
1468 1756
1469use CFClient::OpenGL; 1757use CFClient::OpenGL;
1470 1758
1471my %tex = ( 1759my %tex = (
1472 food => [ 1760 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1761 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1762 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1763 ],
1476 grace => [ 1764 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1765 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 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/
1479 ], 1767 ],
1480 hp => [ 1768 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1769 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1770 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1771 ],
1484 mana => [ 1772 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1773 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 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/
1487 ], 1775 ],
1488); 1776);
1489 1777
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1778# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1779sub new {
… …
1510} 1798}
1511 1799
1512sub set_max { 1800sub set_max {
1513 my ($self, $max) = @_; 1801 my ($self, $max) = @_;
1514 1802
1803 return if $self->{max_val} == $max;
1804
1515 $self->{max_val} = $max; 1805 $self->{max_val} = $max;
1806 $self->update;
1516} 1807}
1517 1808
1518sub set_value { 1809sub set_value {
1519 my ($self, $val, $max) = @_; 1810 my ($self, $val, $max) = @_;
1520 1811
1521 $self->set_max ($max) 1812 $self->set_max ($max)
1522 if defined $max; 1813 if defined $max;
1523 1814
1524 $max = $self->{max_val}; 1815 return if $self->{val} == $val;
1816
1525 $self->{val} = $val; 1817 $self->{val} = $val;
1526
1527 $self->update; 1818 $self->update;
1528} 1819}
1529 1820
1530sub _draw { 1821sub _draw {
1531 my ($self) = @_; 1822 my ($self) = @_;
1532 1823
1533 my $tex = $tex{$self->{type}}; 1824 my $tex = $tex{$self->{type}};
1825 my ($t1, $t2, $t3) = @$tex;
1534 1826
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1827 my ($w, $h) = ($self->{w}, $self->{h});
1536 1828
1537 if ($self->{vertical}) { 1829 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1; 1830 glRotate 90, 0, 0, 1;
… …
1540 1832
1541 ($w, $h) = ($h, $w); 1833 ($w, $h) = ($h, $w);
1542 } 1834 }
1543 1835
1544 my $ycut = $self->{val} / ($self->{max_val} || 1); 1836 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546 1837
1547 my $t1 = $tex->[0]; 1838 my $ycut1 = max 0, min 1, $ycut;
1548 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);
1549 1843
1550 glEnable GL_BLEND; 1844 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1848
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1849 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS; 1850 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0; 1851 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1852 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1853 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1854 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd; 1855 glEnd;
1565 1856
1857 my $ycut1 = List::Util::min 1, $ycut;
1566 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1858 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS; 1859 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1860 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1861 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1862 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1863 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1572 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 }
1573 1875
1574 glDisable GL_BLEND; 1876 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D; 1877 glDisable GL_TEXTURE_2D;
1576} 1878}
1577 1879
… …
1580package CFClient::UI::Gauge; 1882package CFClient::UI::Gauge;
1581 1883
1582our @ISA = CFClient::UI::VBox::; 1884our @ISA = CFClient::UI::VBox::;
1583 1885
1584sub new { 1886sub new {
1585 my ($class, %arg) = shift; 1887 my ($class, %arg) = @_;
1586 1888
1587 my $self = $class->SUPER::new ( 1889 my $self = $class->SUPER::new (
1588 @_, 1890 tooltip => $arg{type},
1891 can_hover => 1,
1892 can_events => 1,
1893 %arg,
1589 ); 1894 );
1590 1895
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1896 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1897 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1898 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1594 1899
1595 $self 1900 $self
1901}
1902
1903sub set_fontsize {
1904 my ($self, $fsize) = @_;
1905
1906 $self->{value}->set_fontsize ($fsize);
1907 $self->{max} ->set_fontsize ($fsize);
1908}
1909
1910sub set_max {
1911 my ($self, $max) = @_;
1912
1913 $self->{gauge}->set_max ($max);
1914 $self->{max}->set_text ($max);
1596} 1915}
1597 1916
1598sub set_value { 1917sub set_value {
1599 my ($self, $val, $max) = @_; 1918 my ($self, $val, $max) = @_;
1600 1919
1601 $self->set_max ($max) 1920 $self->set_max ($max)
1602 if defined $max; 1921 if defined $max;
1603 1922
1604 $self->{gauge}->set_value ($val, $max); 1923 $self->{gauge}->set_value ($val, $max);
1605 $self->{value}->set_text ($val); 1924 $self->{value}->set_text ($val);
1606}
1607
1608sub set_max {
1609 my ($self, $max) = @_;
1610
1611 $self->{gauge}->set_max ($max);
1612 $self->{max}->set_text ($max);
1613} 1925}
1614 1926
1615############################################################################# 1927#############################################################################
1616 1928
1617package CFClient::UI::Slider; 1929package CFClient::UI::Slider;
… …
1757 2069
1758sub new { 2070sub new {
1759 my $class = shift; 2071 my $class = shift;
1760 2072
1761 my $self = $class->SUPER::new ( 2073 my $self = $class->SUPER::new (
1762 fontsize => 1, 2074 fontsize => 1,
2075 can_events => 0,
2076 #font => default_font
1763 @_, 2077 @_,
1764 2078
1765 layout => (new CFClient::Layout), 2079 layout => (new CFClient::Layout),
1766 par => [], 2080 par => [],
1767 height => 0, 2081 height => 0,
1768 children => [ 2082 children => [
1769 (new CFClient::UI::Empty expand => 1), 2083 (new CFClient::UI::Empty expand => 1),
1770 (new CFClient::UI::Slider vertical => 1), 2084 (new CFClient::UI::Slider vertical => 1),
1771 ], 2085 ],
1772 ); 2086 );
1773 2087
… …
1807sub size_allocate { 2121sub size_allocate {
1808 my ($self, $w, $h) = @_; 2122 my ($self, $w, $h) = @_;
1809 2123
1810 $self->SUPER::size_allocate ($w, $h); 2124 $self->SUPER::size_allocate ($w, $h);
1811 2125
2126 $self->{layout}->set_font ($self->{font}) if $self->{font};
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2127 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w}); 2128 $self->{layout}->set_width ($self->{children}[0]{w});
1814 2129
1815 $self->reflow; 2130 $self->reflow;
1816} 2131}
… …
1852 2167
1853 delete $self->{texture}; 2168 delete $self->{texture};
1854 } 2169 }
1855 2170
1856 $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 {
1857 glClearColor 0, 0, 0, 1; 2172 glClearColor 0, 0, 0, 0;
1858 glClear GL_COLOR_BUFFER_BIT; 2173 glClear GL_COLOR_BUFFER_BIT;
1859 2174
1860 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
1861 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1862 glEnable GL_TEXTURE_2D; 2177 glEnable GL_TEXTURE_2D;
… …
1869 2184
1870 my $y = 0; 2185 my $y = 0;
1871 2186
1872 my $layout = $self->{layout}; 2187 my $layout = $self->{layout};
1873 2188
2189 $layout->set_font ($self->{font}) if $self->{font};
2190
1874 for my $par (@{$self->{par}}) { 2191 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0]; 2192 my $h = $par->[0];
1876 2193
1877 if ($y0 < $y + $h && $y < $y1) { 2194 if ($y0 < $y + $h && $y < $y1) {
1878 $layout->set_text ($par->[2]); 2195 $layout->set_text ($par->[2]);
… …
1893 2210
1894sub _draw { 2211sub _draw {
1895 my ($self) = @_; 2212 my ($self) = @_;
1896 2213
1897 if ($self->{texture}) { 2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1898 glEnable GL_TEXTURE_2D; 2217 glEnable GL_TEXTURE_2D;
1899 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;
1900 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1901 glDisable GL_TEXTURE_2D; 2221 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
1902 } 2223 }
1903 2224
1904 $self->{children}[1]->draw; 2225 $self->{children}[1]->draw;
1905 2226
1906} 2227}
… …
1955 2276
1956sub new { 2277sub new {
1957 my $class = shift; 2278 my $class = shift;
1958 2279
1959 my $self = $class->SUPER::new ( 2280 my $self = $class->SUPER::new (
1960 state => 0, 2281 state => 0,
1961 connect_activate => \&toggle_flopper, 2282 connect_activate => \&toggle_flopper,
1962 @_ 2283 @_
1963 ); 2284 );
1964 2285
1965 if ($self->{state}) { 2286 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2307 $self->emit (changed => $self->{state});
1987} 2308}
1988 2309
1989############################################################################# 2310#############################################################################
1990 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
1991package CFClient::UI::Root; 2421package CFClient::UI::Root;
1992 2422
1993our @ISA = CFClient::UI::Container::; 2423our @ISA = CFClient::UI::Container::;
1994 2424
1995use CFClient::OpenGL; 2425use CFClient::OpenGL;
1996 2426
1997sub check_size { 2427sub check_size {
1998 my ($self) = @_; 2428 my ($self) = @_;
1999 2429
2000 $self->configure (0, 0, $::WITH, $::HEIGHT); 2430 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2001} 2431}
2002 2432
2003sub size_request { 2433sub size_request {
2004 ($::WIDTH, $::HEIGHT) 2434 ($::WIDTH, $::HEIGHT)
2005} 2435}
… …
2007sub configure { 2437sub configure {
2008 my ($self, $x, $y, $w, $h) = @_; 2438 my ($self, $x, $y, $w, $h) = @_;
2009 2439
2010 $self->SUPER::configure ($x, $y, $w, $h); 2440 $self->SUPER::configure ($x, $y, $w, $h);
2011 2441
2012 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2013 for @{$self->{children}}; 2442 for my $child (@{$self->{children}}) {
2443 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2444
2445 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2446 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2447 $child->configure ($X, $Y, $W,$H);
2448 }
2014} 2449}
2015 2450
2016sub _topleft { 2451sub _topleft {
2017 my ($self, $x, $y) = @_; 2452 my ($self, $x, $y) = @_;
2018 2453
… …
2026 ::refresh (); 2461 ::refresh ();
2027} 2462}
2028 2463
2029sub add { 2464sub add {
2030 my ($self, $child) = @_; 2465 my ($self, $child) = @_;
2466
2467 # integerize window positions
2468 $child->{x} = int $child->{x};
2469 $child->{y} = int $child->{y};
2031 2470
2032 $self->SUPER::add ($child); 2471 $self->SUPER::add ($child);
2033} 2472}
2034 2473
2035sub on_refresh { 2474sub on_refresh {
… …
2061############################################################################# 2500#############################################################################
2062 2501
2063package CFClient::UI; 2502package CFClient::UI;
2064 2503
2065$ROOT = new CFClient::UI::Root; 2504$ROOT = new CFClient::UI::Root;
2505$TOOLTIP = new CFClient::UI::Tooltip;
2066 2506
20671 25071
2068 2508

Diff Legend

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