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.140 by root, Thu Apr 20 04:20:52 2006 UTC vs.
Revision 1.176 by root, Tue Apr 25 12:10:58 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
151 $self->{x} = $x;
152 $self->{y} = $y;
153
154 if ($self->{aspect}) { 218 if ($self->{aspect}) {
155 $w = List::Util::min $w, int $h * $self->{aspect}; 219 my $w2 = List::Util::min $w, int $h * $self->{aspect};
156 $h = List::Util::min $h, int $w / $self->{aspect}; 220 my $h2 = List::Util::min $h, int $w / $self->{aspect};
157 }
158 221
222 # use alignment to adjust x, y
223
224 $x += int +($w - $w2) * 0.5;
225 $y += int +($h - $h2) * 0.5;
226
227 ($w, $h) = ($w2, $h2);
228 }
229
230 if ($self->{x} != $x || $self->{y} != $y) {
231 $self->{x} = $x;
232 $self->{y} = $y;
233 $self->update;
234 }
235
159 return unless $self->{w} != $w || $self->{h} != $h; 236 if ($self->{w} != $w || $self->{h} != $h) {
160
161 $self->{w} = $w; 237 $self->{w} = $w;
162 $self->{h} = $h; 238 $self->{h} = $h;
163 239
164 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
165 $self->update; 241 $self->update;
242 }
166} 243}
167 244
168sub size_allocate { 245sub size_allocate {
169 # nothing to be done 246 # nothing to be done
247}
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;
170} 267}
171 268
172# return top left coordinates 269# return top left coordinates
173sub _topleft { 270sub _topleft {
174 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
175 275
176 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
177} 277}
178 278
179# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
257 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
258 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
259 glEnd; 359 glEnd;
260 glDisable GL_BLEND; 360 glDisable GL_BLEND;
261 } 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 }
262} 376}
263 377
264sub _draw { 378sub _draw {
265 my ($self) = @_; 379 my ($self) = @_;
266 380
267 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
268} 382}
269 383
270sub find_widget { 384sub find_widget {
271 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
272 388
273 return $self 389 return $self
274 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
275 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
276 392
… …
284} 400}
285 401
286sub check_size { 402sub check_size {
287 my ($self) = @_; 403 my ($self) = @_;
288 404
289 my ($w, $h) = $self->size_request; 405 $self->{parent}
406 or return 1;
290 407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
291 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
292 $self->{req_w} = $w; 413 $self->{req_w} = $w;
293 $self->{req_h} = $h; 414 $self->{req_h} = $h;
294 415
295 $self->{parent}->check_size 416 $self->{parent}->check_size
296 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
297 } 425 }
298} 426}
299 427
300sub update { 428sub update {
301 my ($self) = @_; 429 my ($self) = @_;
… …
311} 439}
312 440
313sub emit { 441sub emit {
314 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
315 443
316 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
317 $cb->($self, @args);
318 }
319} 445}
320 446
321sub DESTROY { 447sub DESTROY {
322 my ($self) = @_; 448 my ($self) = @_;
323 449
… …
368 494
369package CFClient::UI::Empty; 495package CFClient::UI::Empty;
370 496
371our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
372 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
373sub size_request { 504sub size_request {
374 (0, 0) 505 (0, 0)
375} 506}
376 507
377sub draw { } 508sub draw { }
… …
385sub new { 516sub new {
386 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
387 518
388 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
389 520
390 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
391 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
392 527
393 $self 528 $self
394} 529}
395 530
… …
406 ]; 541 ];
407 542
408 $child->check_size; 543 $child->check_size;
409} 544}
410 545
546sub children {
547 @{ $_[0]{children} }
548}
549
411sub remove { 550sub remove {
412 my ($self, $child) = @_; 551 my ($self, $child) = @_;
413 552
414 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
415 555
416 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
417 557
418 $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 }
419} 572}
420 573
421sub find_widget { 574sub find_widget {
422 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
423 576
… …
498} 651}
499 652
500sub update { 653sub update {
501 my ($self) = @_; 654 my ($self) = @_;
502 655
503 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
504 $self->render_chld;
505 $self->SUPER::update; 657 $self->SUPER::update;
506} 658}
507 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
508sub render_chld { 667sub render_child {
509 my ($self) = @_; 668 my ($self) = @_;
510 669
511 $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 {
512 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
513 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
514 $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;
515 }; 681 };
516}
517
518sub size_allocate {
519 my ($self, $w, $h) = @_;
520
521 $self->child->configure (0, 0, $w, $h);
522
523 $self->render_chld;
524} 682}
525 683
526sub _draw { 684sub _draw {
527 my ($self) = @_; 685 my ($self) = @_;
528 686
529 my ($w, $h) = ($self->w, $self->h); 687 my ($w, $h) = ($self->w, $self->h);
530 688
531 my $tex = $self->{texture} 689 my $tex = $self->{texture}
532 or return; 690 or return;
691
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
697
698 $tex->draw_quad (0, 0, $w, $h);
699
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D;
702}
703
704#############################################################################
705
706package CFClient::UI::ViewPort;
707
708our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735
736sub new {
737 my $class = shift;
738
739 my $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1],
741 border_bg => [1, 1, 1, 1],
742 border => 0.8,
743 @_
744 );
745
746 $self
747}
748
749sub _draw {
750 my ($self) = @_;
751
752 my ($w, $h) = ($self->{w}, $self->{h});
533 753
534 glEnable GL_BLEND; 754 glEnable GL_BLEND;
535 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
536 glEnable GL_TEXTURE_2D; 756 glEnable GL_TEXTURE_2D;
537 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
538 758
539 $tex->draw_quad (0, 0, $w, $h); 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;
540 766
767
768 $self->child->draw;
541 glDisable GL_BLEND; 769 glDisable GL_BLEND;
542 glDisable GL_TEXTURE_2D; 770 glDisable GL_TEXTURE_2D;
543} 771}
544 772
545############################################################################# 773#############################################################################
546 774
547package CFClient::UI::ViewPort;
548
549our @ISA = CFClient::UI::Window::;
550
551sub new { die }
552
553sub size_request {
554 my ($self) = @_;
555
556 @$self{qw(child_w child_h)} = $self->child->size_request;
557 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
558
559 @$self{qw(child_w child_h)}
560}
561
562sub _draw {
563 my ($self) = @_;
564
565 $self->{children}[1]->draw;
566}
567
568
569#############################################################################
570
571package CFClient::UI::Frame; 775package CFClient::UI::FancyFrame;
572 776
573our @ISA = CFClient::UI::Bin::; 777our @ISA = CFClient::UI::Bin::;
574 778
575use CFClient::OpenGL; 779use CFClient::OpenGL;
576 780
577sub size_request {
578 my ($self) = @_;
579 my $chld = $self->child
580 or return (0, 0);
581
582 $chld->move (2, 2);
583
584 map { $_ + 4 } $chld->size_request;
585}
586
587sub size_allocate {
588 my ($self, $x, $y, $w, $h) = @_;
589
590 $self->child->configure (2, 2, $w - 4, $h - 4);
591}
592
593sub _draw {
594 my ($self) = @_;
595
596 my $chld = $self->child;
597
598 my ($w, $h) = $chld->size_request;
599
600 glBegin GL_QUADS;
601 glColor 0, 0, 0;
602 glVertex 0 , 0;
603 glVertex 0 , $h + 4;
604 glVertex $w + 4 , $h + 4;
605 glVertex $w + 4 , 0;
606 glEnd;
607
608 $chld->draw;
609}
610
611#############################################################################
612
613package CFClient::UI::FancyFrame;
614
615our @ISA = CFClient::UI::Bin::;
616
617use CFClient::OpenGL;
618
619my @tex = 781my @tex =
620 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
621 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
622 784
623sub new { 785sub new {
624 my $class = shift; 786 my $class = shift;
625 787
626 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
627 789
628 $class->SUPER::new ( 790 my $self = $class->SUPER::new (
629 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
630 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
631 border => 0.8, 793 border => 0.6,
794 can_events => 1,
632 @_ 795 @_
633 ) 796 );
797
798 $self->{title} &&= new CFClient::UI::Label
799 align => 0,
800 valign => 1,
801 text => $self->{title},
802 fontsize => $self->{border};
803
804 $self
634} 805}
635 806
636sub border { 807sub border {
637 int $_[0]{border} * $::FONTSIZE 808 int $_[0]{border} * $::FONTSIZE
638} 809}
639 810
640sub size_request { 811sub size_request {
641 my ($self) = @_; 812 my ($self) = @_;
642
643 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
644 813
645 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
646 815
647 ( 816 (
648 $w + $self->border * 2, 817 $w + $self->border * 2,
… …
654 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
655 824
656 $h -= List::Util::max 0, $self->border * 2; 825 $h -= List::Util::max 0, $self->border * 2;
657 $w -= List::Util::max 0, $self->border * 2; 826 $w -= List::Util::max 0, $self->border * 2;
658 827
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
829 if $self->{title};
830
659 $self->child->configure ($self->border, $self->border, $w, $h); 831 $self->child->configure ($self->border, $self->border, $w, $h);
660} 832}
661 833
662sub button_down { 834sub button_down {
663 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
664 836
837 my ($w, $h) = @$self{qw(w h)};
665 my $border = $self->border; 838 my $border = $self->border;
666 839
667 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
668 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
669 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
670 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
671 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
672 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
673 $self->{motion} = sub { 851 $self->{motion} = sub {
674 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
675 853
676 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
677 856
678 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
679 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
680 $self->check_size; 860 $self->check_size;
681 }; 861 };
682 862
683 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
684 && $y >= 0 && $y < $border) {
685
686 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
687 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
688 866
689 $self->{motion} = sub { 867 $self->{motion} = sub {
690 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
742 $bg->draw_quad ($border, $border, $cw, $ch); 920 $bg->draw_quad ($border, $border, $cw, $ch);
743 921
744 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
745 glDisable GL_BLEND; 923 glDisable GL_BLEND;
746 924
925 $self->{title}->draw if $self->{title};
747 $self->child->draw; 926 $self->child->draw;
748} 927}
749 928
750############################################################################# 929#############################################################################
751 930
… …
773 $self->{children}[$y][$x] = $child; 952 $self->{children}[$y][$x] = $child;
774 953
775 $child->check_size; 954 $child->check_size;
776} 955}
777 956
957sub children {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} }
959}
960
778# TODO: move to container class maybe? send childs a signal on removal? 961# TODO: move to container class maybe? send childs a signal on removal?
779sub clear { 962sub clear {
780 my ($self) = @_; 963 my ($self) = @_;
781 964
965 my @children = $self->children;
782 delete $self->{children}; 966 delete $self->{children};
967
968 for (@children) {
969 delete $_->{parent};
970 $_->hide;
971 }
972
783 $self->update; 973 $self->update;
784} 974}
785 975
786sub get_wh { 976sub get_wh {
787 my ($self) = @_; 977 my ($self) = @_;
… …
793 or next; 983 or next;
794 984
795 for my $x (0 .. $#$row) { 985 for my $x (0 .. $#$row) {
796 my $widget = $row->[$x] 986 my $widget = $row->[$x]
797 or next; 987 or next;
798 my ($w, $h) = $widget->size_request; 988 my ($w, $h) = @$widget{qw(req_w req_h)};
799 989
800 $w[$x] = max $w[$x], $w; 990 $w[$x] = max $w[$x], $w;
801 $h[$y] = max $h[$y], $h; 991 $h[$y] = max $h[$y], $h;
802 } 992 }
803 } 993 }
… …
908 1098
909 ($h, $w) = ($w, $h); 1099 ($h, $w) = ($w, $h);
910 1100
911 my $children = $self->{children}; 1101 my $children = $self->{children};
912 1102
913 my @h = map +($_->size_request)[0], @$children; 1103 my @h = map $_->{req_w}, @$children;
914 1104
915 my $req_h = List::Util::sum @h; 1105 my $req_h = List::Util::sum @h;
916 1106
917 if ($req_h > $h) { 1107 if ($req_h > $h) {
918 # ah well, not enough space 1108 # ah well, not enough space
… …
966sub size_allocate { 1156sub size_allocate {
967 my ($self, $w, $h) = @_; 1157 my ($self, $w, $h) = @_;
968 1158
969 my $children = $self->{children}; 1159 my $children = $self->{children};
970 1160
971 my @h = map +($_->size_request)[1], @$children; 1161 my @h = map $_->{req_h}, @$children;
972 1162
973 my $req_h = List::Util::sum @h; 1163 my $req_h = List::Util::sum @h;
974 1164
975 if ($req_h > $h) { 1165 if ($req_h > $h) {
976 # ah well, not enough space 1166 # ah well, not enough space
… …
1010 1200
1011sub new { 1201sub new {
1012 my ($class, %arg) = @_; 1202 my ($class, %arg) = @_;
1013 1203
1014 my $self = $class->SUPER::new ( 1204 my $self = $class->SUPER::new (
1015 fg => [1, 1, 1], 1205 fg => [1, 1, 1],
1206 #font => default_font
1016 fontsize => 1, 1207 fontsize => 1,
1017 text => "", 1208 text => "",
1018 align => -1, 1209 align => -1,
1019 valign => -1, 1210 valign => -1,
1020 padding => 2, 1211 padding => 2,
1021 layout => new CFClient::Layout, 1212 layout => new CFClient::Layout,
1213 can_events => 0,
1022 %arg 1214 %arg
1023 ); 1215 );
1024 1216
1025 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1217 if (exists $self->{template}) {
1218 my $layout = new CFClient::Layout;
1219 $layout->set_text (delete $self->{template});
1220 $self->{template} = $layout;
1221 }
1026 1222
1027 $self->set_text (delete $self->{text}) if exists $self->{text}; 1223 $self->set_text (delete $self->{text}) if exists $self->{text};
1028 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1029 1225
1030 $self 1226 $self
1031} 1227}
1032 1228
1033sub escape_text { 1229sub escape {
1034 local $_ = $_[1]; 1230 local $_ = $_[1];
1035 1231
1036 s/&/&amp;/g; 1232 s/&/&amp;/g;
1037 s/>/&gt;/g; 1233 s/>/&gt;/g;
1038 s/</&lt;/g; 1234 s/</&lt;/g;
1039 1235
1040 $_[1] 1236 $_[1]
1041} 1237}
1042 1238
1239sub update {
1240 my ($self) = @_;
1241
1242 delete $self->{texture};
1243 $self->SUPER::update;
1244}
1245
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
1043sub set_text { 1252sub set_text {
1044 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
1045 1254
1255 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text";
1257
1046 $self->{layout}->set_text ($text); 1258 $self->{layout}->set_text ($text);
1047 1259
1048 delete $self->{texture}; 1260 delete $self->{texture};
1049 $self->update; 1261 $self->update;
1262 $self->check_size;
1050} 1263}
1051 1264
1052sub set_markup { 1265sub set_markup {
1053 my ($self, $markup) = @_; 1266 my ($self, $markup) = @_;
1054 1267
1268 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup";
1270
1055 $self->{layout}->set_markup ($markup); 1271 $self->{layout}->set_markup ($markup);
1056 1272
1057 delete $self->{texture}; 1273 delete $self->{texture};
1058 $self->update; 1274 $self->update;
1275 $self->check_size;
1059} 1276}
1060 1277
1061sub size_request { 1278sub size_request {
1062 my ($self) = @_; 1279 my ($self) = @_;
1063 1280
1064 $self->{layout}->set_width; 1281 $self->{layout}->set_font ($self->{font}) if $self->{font};
1282 $self->{layout}->set_width ($self->{max_w} || -1);
1065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1283 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1066 1284
1067 my ($w, $h) = $self->{layout}->size; 1285 my ($w, $h) = $self->{layout}->size;
1286
1287 if (exists $self->{template}) {
1288 $self->{template}->set_font ($self->{font}) if $self->{font};
1289 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1290
1291 my ($w2, $h2) = $self->{template}->size;
1292
1293 $w = List::Util::max $w, $w2;
1294 $h = List::Util::max $h, $h2;
1295 }
1068 1296
1069 ( 1297 (
1070 $w + $self->{padding} * 2, 1298 $w + $self->{padding} * 2,
1071 $h + $self->{padding} * 2, 1299 $h + $self->{padding} * 2,
1072 ) 1300 )
… …
1076 my ($self, $w, $h) = @_; 1304 my ($self, $w, $h) = @_;
1077 1305
1078 delete $self->{texture}; 1306 delete $self->{texture};
1079} 1307}
1080 1308
1309sub set_fontsize {
1310 my ($self, $fontsize) = @_;
1311
1312 $self->{fontsize} = $fontsize;
1313 delete $self->{texture};
1314 $self->check_size;
1315 $self->update;
1316}
1317
1081sub _draw { 1318sub _draw {
1082 my ($self) = @_; 1319 my ($self) = @_;
1083 1320
1084 my $tex = $self->{texture} ||= do { 1321 my $tex = $self->{texture} ||= do {
1322 $self->{layout}->set_font ($self->{font}) if $self->{font};
1085 $self->{layout}->set_width ($self->{w}); 1323 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1087 new_from_layout CFClient::Texture $self->{layout} 1325 new_from_layout CFClient::Texture $self->{layout}
1088 }; 1326 };
1089 1327
… …
1122 1360
1123sub new { 1361sub new {
1124 my $class = shift; 1362 my $class = shift;
1125 1363
1126 $class->SUPER::new ( 1364 $class->SUPER::new (
1127 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1128 bg => [0, 0, 0, 0.2], 1366 bg => [0, 0, 0, 0.2],
1129 active_bg => [1, 1, 1, 0.5], 1367 active_bg => [1, 1, 1, 0.5],
1130 active_fg => [0, 0, 0], 1368 active_fg => [0, 0, 0],
1131 can_hover => 1, 1369 can_hover => 1,
1132 can_focus => 1, 1370 can_focus => 1,
1133 valign => 0, 1371 valign => 0,
1372 can_events => 1,
1134 @_ 1373 @_
1135 ) 1374 )
1136} 1375}
1137 1376
1138sub _set_text { 1377sub _set_text {
… …
1166} 1405}
1167 1406
1168sub size_allocate { 1407sub size_allocate {
1169 my ($self, $w, $h) = @_; 1408 my ($self, $w, $h) = @_;
1170 1409
1171 $self->_set_text ($self->{text}); 1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1172} 1411}
1173 1412
1174sub set_text { 1413sub set_text {
1175 my ($self, $text) = @_; 1414 my ($self, $text) = @_;
1176 1415
… …
1291 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1292 1531
1293 my $sym = $ev->{sym}; 1532 my $sym = $ev->{sym};
1294 1533
1295 if ($sym == 13) { 1534 if ($sym == 13) {
1535 unshift @{$self->{history}},
1536 my $txt = $self->get_text;
1537 $self->{history_pointer} = -1;
1538 $self->{history_saveback} = '';
1296 $self->emit (activate => $self->get_text); 1539 $self->emit (activate => $txt);
1297 $self->update; 1540 $self->update;
1541
1542 } elsif ($sym == CFClient::SDLK_UP) {
1543 if ($self->{history_pointer} < 0) {
1544 $self->{history_saveback} = $self->get_text;
1545 }
1546 if (@{$self->{history} || []} > 0) {
1547 $self->{history_pointer}++;
1548 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1549 $self->{history_pointer} = @{$self->{history} || []} - 1;
1550 }
1551 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1552 }
1553
1554 } elsif ($sym == CFClient::SDLK_DOWN) {
1555 $self->{history_pointer}--;
1556 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1557
1558 if ($self->{history_pointer} >= 0) {
1559 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1560 } else {
1561 $self->set_text ($self->{history_saveback});
1562 }
1298 1563
1299 } else { 1564 } else {
1300 $self->SUPER::key_down ($ev); 1565 $self->SUPER::key_down ($ev);
1301 } 1566 }
1302 1567
… …
1309our @ISA = CFClient::UI::Label::; 1574our @ISA = CFClient::UI::Label::;
1310 1575
1311use CFClient::OpenGL; 1576use CFClient::OpenGL;
1312 1577
1313my @tex = 1578my @tex =
1314 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1579 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1315 qw(b1_button_active.png); 1580 qw(b1_button_active.png);
1316 1581
1317sub new { 1582sub new {
1318 my $class = shift; 1583 my $class = shift;
1319 1584
1320 $class->SUPER::new ( 1585 $class->SUPER::new (
1321 padding => 4, 1586 padding => 4,
1322 fg => [1, 1, 1], 1587 fg => [1, 1, 1],
1323 bg => [1, 1, 1, 0.2], 1588 bg => [1, 1, 1, 0.2],
1324 active_fg => [0, 0, 1], 1589 active_fg => [0, 0, 1],
1325 can_hover => 1, 1590 can_hover => 1,
1326 align => 0, 1591 align => 0,
1327 valign => 0, 1592 valign => 0,
1593 can_events => 1,
1328 @_ 1594 @_
1329 ) 1595 )
1330} 1596}
1331 1597
1332sub button_up { 1598sub button_up {
… …
1366package CFClient::UI::CheckBox; 1632package CFClient::UI::CheckBox;
1367 1633
1368our @ISA = CFClient::UI::DrawBG::; 1634our @ISA = CFClient::UI::DrawBG::;
1369 1635
1370my @tex = 1636my @tex =
1371 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1372 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1638 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1373 1639
1374use CFClient::OpenGL; 1640use CFClient::OpenGL;
1375 1641
1376sub new { 1642sub new {
… …
1425 glDisable GL_BLEND; 1691 glDisable GL_BLEND;
1426} 1692}
1427 1693
1428############################################################################# 1694#############################################################################
1429 1695
1430package CFClient::UI::VGauge; 1696package CFClient::UI::Image;
1431 1697
1432our @ISA = CFClient::UI::Base::; 1698our @ISA = CFClient::UI::Base::;
1433 1699
1434use CFClient::OpenGL; 1700use CFClient::OpenGL;
1701use Carp qw/confess/;
1435 1702
1436my %tex = ( 1703our %loaded_images;
1437 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ],
1441 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1444 ],
1445 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ],
1449 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1452 ],
1453);
1454 1704
1455# eg. VGauge->new (gauge => 'food'), default gauge: food
1456sub new { 1705sub new {
1457 my $class = shift; 1706 my $class = shift;
1458 1707
1459 my $self = $class->SUPER::new ( 1708 my $self = $class->SUPER::new (can_events => 0, @_);
1460 gauge => 'food',
1461 @_
1462 );
1463 1709
1464 $self->{aspect} = $tex{$self->{gauge}}[0]{w} / $tex{$self->{gauge}}[0]{h}; 1710 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1711
1712 $loaded_images{$self->{image}} ||=
1713 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1714
1715 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1716
1717 Scalar::Util::weaken $loaded_images{$self->{image}};
1718
1719 $self->{aspect} = $tex->{w} / $tex->{h};
1465 1720
1466 $self 1721 $self
1467} 1722}
1468 1723
1469sub size_request { 1724sub size_request {
1470 my ($self) = @_; 1725 my ($self) = @_;
1471 1726
1472 my $tex = $tex{$self->{gauge}}[0]; 1727 ($self->{tex}->{w}, $self->{tex}->{h})
1473
1474 @$tex{qw(w h)}
1475}
1476
1477sub set_max {
1478 my ($self, $max) = @_;
1479
1480 $self->{max_val} = $max;
1481}
1482
1483sub set_value {
1484 my ($self, $val, $max) = @_;
1485
1486 $self->set_max ($max)
1487 if defined $max;
1488
1489 $max = $self->{max_val};
1490 $self->{val} = $val;
1491
1492 $self->update;
1493} 1728}
1494 1729
1495sub _draw { 1730sub _draw {
1496 my ($self) = @_; 1731 my ($self) = @_;
1497 1732
1498 my $tex = $tex{$self->{gauge}}; 1733 my $tex = $self->{tex};
1499 1734
1500 my ($w, $h) = ($self->{w}, $self->{h}); 1735 my ($w, $h) = ($self->{w}, $self->{h});
1501 1736
1502 my $ycut = $self->{val} / ($self->{max_val} || 1); 1737 if ($self->{rot90}) {
1503 $ycut = 1 if $self->{val} > $self->{max_val}; 1738 glRotate 90, 0, 0, 1;
1739 glTranslate 0, -$self->{w}, 0;
1504 1740
1505 my $t1 = $tex->[0]; 1741 ($w, $h) = ($h, $w);
1506 my $t2 = $tex->[1]; 1742 }
1507 1743
1508 glEnable GL_BLEND; 1744 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D; 1746 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 1748
1749 $tex->draw_quad (0, 0, $w, $h);
1750
1751 glDisable GL_BLEND;
1752 glDisable GL_TEXTURE_2D;
1753}
1754
1755#############################################################################
1756
1757package CFClient::UI::VGauge;
1758
1759our @ISA = CFClient::UI::Base::;
1760
1761use List::Util qw(min max);
1762
1763use CFClient::OpenGL;
1764
1765my %tex = (
1766 food => [
1767 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1768 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1769 ],
1770 grace => [
1771 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1772 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1773 ],
1774 hp => [
1775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1776 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1777 ],
1778 mana => [
1779 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1780 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1781 ],
1782);
1783
1784# eg. VGauge->new (gauge => 'food'), default gauge: food
1785sub new {
1786 my $class = shift;
1787
1788 my $self = $class->SUPER::new (
1789 type => 'food',
1790 @_
1791 );
1792
1793 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1794
1795 $self
1796}
1797
1798sub size_request {
1799 my ($self) = @_;
1800
1801 #my $tex = $tex{$self->{type}}[0];
1802 #@$tex{qw(w h)}
1803 (0, 0)
1804}
1805
1806sub set_max {
1807 my ($self, $max) = @_;
1808
1809 return if $self->{max_val} == $max;
1810
1811 $self->{max_val} = $max;
1812 $self->update;
1813}
1814
1815sub set_value {
1816 my ($self, $val, $max) = @_;
1817
1818 $self->set_max ($max)
1819 if defined $max;
1820
1821 return if $self->{val} == $val;
1822
1823 $self->{val} = $val;
1824 $self->update;
1825}
1826
1827sub _draw {
1828 my ($self) = @_;
1829
1830 my $tex = $tex{$self->{type}};
1831 my ($t1, $t2, $t3) = @$tex;
1832
1833 my ($w, $h) = ($self->{w}, $self->{h});
1834
1835 if ($self->{vertical}) {
1836 glRotate 90, 0, 0, 1;
1837 glTranslate 0, -$self->{w}, 0;
1838
1839 ($w, $h) = ($h, $w);
1840 }
1841
1842 my $ycut = $self->{val} / ($self->{max_val} || 1);
1843
1844 my $ycut1 = max 0, min 1, $ycut;
1845 my $ycut2 = max 0, min 1, $ycut - 1;
1846
1513 my $h1 = $self->{h} - $ycut * $self->{h}; 1847 my $h1 = $self->{h} * (1 - $ycut1);
1514 my $h2 = $ycut * $self->{h}; 1848 my $h2 = $self->{h} * (1 - $ycut2);
1515 1849
1516 my $yp = 0; 1850 glEnable GL_BLEND;
1851 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1852 glEnable GL_TEXTURE_2D;
1853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1517 1854
1518 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1855 glBindTexture GL_TEXTURE_2D, $t1->{name};
1519 glBegin GL_QUADS; 1856 glBegin GL_QUADS;
1520 glTexCoord 0 , 0; glVertex 0 , $yp; 1857 glTexCoord 0 , 0; glVertex 0 , 0;
1521 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1858 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1522 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1859 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1523 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1860 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1524 glEnd; 1861 glEnd;
1525 1862
1526 $yp += $h1; 1863 my $ycut1 = List::Util::min 1, $ycut;
1527
1528 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1864 glBindTexture GL_TEXTURE_2D, $t2->{name};
1529 glBegin GL_QUADS; 1865 glBegin GL_QUADS;
1530 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1866 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1531 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1867 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1532 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1533 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1868 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1869 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1534 glEnd; 1870 glEnd;
1871
1872 if ($t3) {
1873 glBindTexture GL_TEXTURE_2D, $t3->{name};
1874 glBegin GL_QUADS;
1875 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1876 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1877 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1878 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1879 glEnd;
1880 }
1535 1881
1536 glDisable GL_BLEND; 1882 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D; 1883 glDisable GL_TEXTURE_2D;
1884}
1885
1886#############################################################################
1887
1888package CFClient::UI::Gauge;
1889
1890our @ISA = CFClient::UI::VBox::;
1891
1892sub new {
1893 my ($class, %arg) = @_;
1894
1895 my $self = $class->SUPER::new (
1896 tooltip => $arg{type},
1897 can_hover => 1,
1898 can_events => 1,
1899 %arg,
1900 );
1901
1902 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1903 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1904 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1905
1906 $self
1907}
1908
1909sub set_fontsize {
1910 my ($self, $fsize) = @_;
1911
1912 $self->{value}->set_fontsize ($fsize);
1913 $self->{max} ->set_fontsize ($fsize);
1914}
1915
1916sub set_max {
1917 my ($self, $max) = @_;
1918
1919 $self->{gauge}->set_max ($max);
1920 $self->{max}->set_text ($max);
1921}
1922
1923sub set_value {
1924 my ($self, $val, $max) = @_;
1925
1926 $self->set_max ($max)
1927 if defined $max;
1928
1929 $self->{gauge}->set_value ($val, $max);
1930 $self->{value}->set_text ($val);
1538} 1931}
1539 1932
1540############################################################################# 1933#############################################################################
1541 1934
1542package CFClient::UI::Slider; 1935package CFClient::UI::Slider;
… …
1682 2075
1683sub new { 2076sub new {
1684 my $class = shift; 2077 my $class = shift;
1685 2078
1686 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1687 fontsize => 1, 2080 fontsize => 1,
2081 can_events => 0,
2082 #font => default_font
1688 @_, 2083 @_,
1689 2084
1690 layout => (new CFClient::Layout), 2085 layout => (new CFClient::Layout),
1691 par => [], 2086 par => [],
1692 height => 0, 2087 height => 0,
1693 children => [ 2088 children => [
1694 (new CFClient::UI::Empty expand => 1), 2089 (new CFClient::UI::Empty expand => 1),
1695 (new CFClient::UI::Slider vertical => 1), 2090 (new CFClient::UI::Slider vertical => 1),
1696 ], 2091 ],
1697 ); 2092 );
1698 2093
1699 $self->{children}[1]->connect (changed => sub { 2094 $self->{children}[1]->connect (changed => sub { $self->update });
1700 $self->update;
1701 });
1702 2095
1703 $self 2096 $self
1704} 2097}
1705 2098
1706sub set_fontsize { 2099sub set_fontsize {
… …
1714 my ($self, $text) = @_; 2107 my ($self, $text) = @_;
1715 2108
1716 my $layout = $self->{layout}; 2109 my $layout = $self->{layout};
1717 2110
1718 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1719 $layout->set_width ($self->{w}); 2112 $layout->set_width ($self->{children}[0]{w});
1720 $layout->set_text ($text); 2113 $layout->set_text ($text);
1721 2114
1722 ($layout->size)[1] 2115 ($layout->size)[1]
1723} 2116}
1724 2117
… …
1732sub size_allocate { 2125sub size_allocate {
1733 my ($self, $w, $h) = @_; 2126 my ($self, $w, $h) = @_;
1734 2127
1735 $self->SUPER::size_allocate ($w, $h); 2128 $self->SUPER::size_allocate ($w, $h);
1736 2129
2130 $self->{layout}->set_font ($self->{font}) if $self->{font};
1737 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2131 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1738 $self->{layout}->set_width ($self->{children}[0]{w}); 2132 $self->{layout}->set_width ($self->{children}[0]{w});
1739 2133
1740 $self->reflow; 2134 $self->reflow;
1741} 2135}
… …
1776 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1777 2171
1778 delete $self->{texture}; 2172 delete $self->{texture};
1779 } 2173 }
1780 2174
1781 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1782 glClearColor 0, 0, 0, 1; 2176 glClearColor 0, 0, 0, 0;
1783 glClear GL_COLOR_BUFFER_BIT; 2177 glClear GL_COLOR_BUFFER_BIT;
1784 2178
1785 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1787 glEnable GL_TEXTURE_2D; 2181 glEnable GL_TEXTURE_2D;
… …
1794 2188
1795 my $y = 0; 2189 my $y = 0;
1796 2190
1797 my $layout = $self->{layout}; 2191 my $layout = $self->{layout};
1798 2192
2193 $layout->set_font ($self->{font}) if $self->{font};
2194
1799 for my $par (@{$self->{par}}) { 2195 for my $par (@{$self->{par}}) {
1800 my $h = $par->[0]; 2196 my $h = $par->[0];
1801 2197
1802 if ($y0 < $y + $h && $y < $y1) { 2198 if ($y0 < $y + $h && $y < $y1) {
1803 $layout->set_text ($par->[2]); 2199 $layout->set_text ($par->[2]);
… …
1817} 2213}
1818 2214
1819sub _draw { 2215sub _draw {
1820 my ($self) = @_; 2216 my ($self) = @_;
1821 2217
1822 if ($self->{texture}) { 2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1823 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1;
1825 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1826 glDisable GL_TEXTURE_2D; 2224 glDisable GL_TEXTURE_2D;
1827 } 2225 glDisable GL_BLEND;
1828 2226
1829 $self->{children}[1]->draw; 2227 $self->{children}[1]->draw;
1830 2228
1831} 2229}
1832 2230
… …
1880 2278
1881sub new { 2279sub new {
1882 my $class = shift; 2280 my $class = shift;
1883 2281
1884 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
1885 state => 0, 2283 state => 0,
1886 connect_activate => \&toggle_flopper, 2284 connect_activate => \&toggle_flopper,
1887 @_ 2285 @_
1888 ); 2286 );
1889 2287
1890 if ($self->{state}) { 2288 if ($self->{state}) {
… …
1911 $self->emit (changed => $self->{state}); 2309 $self->emit (changed => $self->{state});
1912} 2310}
1913 2311
1914############################################################################# 2312#############################################################################
1915 2313
2314package CFClient::UI::Tooltip;
2315
2316our @ISA = CFClient::UI::Bin::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 @_,
2325 can_events => 0,
2326 )
2327}
2328
2329sub set_markup {
2330 my ($self, $text) = @_;
2331
2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2333 $self->{label}->set_markup ($text);
2334 $self->add ($self->{label});
2335}
2336
2337sub size_request {
2338 my ($self) = @_;
2339
2340 $self->child->set_max_size ($::WIDTH * 0.3);
2341
2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343
2344 ($w + 4, $h + 4)
2345}
2346
2347sub size_allocate {
2348 my ($self, $w, $h) = @_;
2349
2350 $self->SUPER::size_allocate ($w - 4, $h - 4);
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 glPushMatrix;
2357 glTranslate 0.375, 0.375;
2358
2359 my ($w, $h) = @$self{qw(w h)};
2360
2361 glColor 1, 0.8, 0.4;
2362 glBegin GL_QUADS;
2363 glVertex 0 , 0;
2364 glVertex 0 , $h;
2365 glVertex $w, $h;
2366 glVertex $w, 0;
2367 glEnd;
2368
2369 glColor 0, 0, 0;
2370 glBegin GL_LINE_LOOP;
2371 glVertex 0 , 0;
2372 glVertex 0 , $h;
2373 glVertex $w, $h;
2374 glVertex $w, 0;
2375 glEnd;
2376
2377 glPopMatrix;
2378
2379 glTranslate 2, 2;
2380 $self->SUPER::_draw;
2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::Face;
2386
2387our @ISA = CFClient::UI::Base::;
2388
2389use CFClient::OpenGL;
2390
2391sub new {
2392 my $class = shift;
2393
2394 $class->SUPER::new (
2395 aspect => 1,
2396 @_,
2397 )
2398}
2399
2400sub size_request {
2401 (32, 8)
2402}
2403
2404sub draw {
2405 my ($self) = @_;
2406
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408
2409 if ($tex) {
2410 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414 glColor 1, 1, 1, 1;
2415 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2416 glDisable GL_TEXTURE_2D;
2417 glDisable GL_BLEND;
2418 }
2419}
2420
2421#############################################################################
2422
1916package CFClient::UI::Root; 2423package CFClient::UI::Root;
1917 2424
1918our @ISA = CFClient::UI::Container::; 2425our @ISA = CFClient::UI::Container::;
1919 2426
1920use CFClient::OpenGL; 2427use CFClient::OpenGL;
1921 2428
1922sub check_size { 2429sub check_size {
1923 my ($self) = @_; 2430 my ($self) = @_;
1924 2431
1925 $self->configure (0, 0, $::WITH, $::HEIGHT); 2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
1926} 2433}
1927 2434
1928sub size_request { 2435sub size_request {
1929 ($::WIDTH, $::HEIGHT) 2436 ($::WIDTH, $::HEIGHT)
1930} 2437}
… …
1932sub configure { 2439sub configure {
1933 my ($self, $x, $y, $w, $h) = @_; 2440 my ($self, $x, $y, $w, $h) = @_;
1934 2441
1935 $self->SUPER::configure ($x, $y, $w, $h); 2442 $self->SUPER::configure ($x, $y, $w, $h);
1936 2443
1937 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1938 for @{$self->{children}}; 2444 for my $child (@{$self->{children}}) {
2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2446
2447 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2449 $child->configure ($X, $Y, $W,$H);
2450 }
1939} 2451}
1940 2452
1941sub _topleft { 2453sub _topleft {
1942 my ($self, $x, $y) = @_; 2454 my ($self, $x, $y) = @_;
1943 2455
… …
1951 ::refresh (); 2463 ::refresh ();
1952} 2464}
1953 2465
1954sub add { 2466sub add {
1955 my ($self, $child) = @_; 2467 my ($self, $child) = @_;
2468
2469 # integerize window positions
2470 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y};
1956 2472
1957 $self->SUPER::add ($child); 2473 $self->SUPER::add ($child);
1958} 2474}
1959 2475
1960sub on_refresh { 2476sub on_refresh {
… …
1986############################################################################# 2502#############################################################################
1987 2503
1988package CFClient::UI; 2504package CFClient::UI;
1989 2505
1990$ROOT = new CFClient::UI::Root; 2506$ROOT = new CFClient::UI::Root;
2507$TOOLTIP = new CFClient::UI::Tooltip;
1991 2508
19921 25091
1993 2510

Diff Legend

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