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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.190 by root, Mon May 8 22:17:38 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
101 can_events => 1, 153 can_events => 1,
102 @_ 154 @_
103 }, $class; 155 }, $class;
104 156
105 for (keys %$self) { 157 for (keys %$self) {
… …
109 } 161 }
110 162
111 $self 163 $self
112} 164}
113 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
114sub show { 173sub show {
115 my ($self) = @_; 174 my ($self) = @_;
116 175
117 return if $self->{parent}; 176 return if $self->{parent};
118 177
… …
120} 179}
121 180
122sub hide { 181sub hide {
123 my ($self) = @_; 182 my ($self) = @_;
124 183
125 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
126 186
127 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
128} 189}
129 190
130sub move { 191sub move {
131 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
132 193
… …
135 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
136 197
137 $self->update; 198 $self->update;
138} 199}
139 200
140sub needs_redraw { 201sub set_size {
141 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
142} 208}
143 209
144sub size_request { 210sub size_request {
145 require Carp; 211 require Carp;
146 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
171 $self->{w} = $w; 237 $self->{w} = $w;
172 $self->{h} = $h; 238 $self->{h} = $h;
173 239
174 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
175 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
176 } 243 }
177} 244}
178 245
179sub size_allocate { 246sub size_allocate {
180 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263}
264
265sub set_max_size {
266 my ($self, $w, $h) = @_;
267
268 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h;
181} 270}
182 271
183# return top left coordinates 272# return top left coordinates
184sub _topleft { 273sub _topleft {
185 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
186 278
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
188} 280}
189 281
190# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 360 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 361 glVertex $x , $y + $self->{h};
270 glEnd; 362 glEnd;
271 glDisable GL_BLEND; 363 glDisable GL_BLEND;
272 } 364 }
365
366 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix;
368 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0;
372 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h};
375 glEnd;
376 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 }
273} 379}
274 380
275sub _draw { 381sub _draw {
276 my ($self) = @_; 382 my ($self) = @_;
277 383
… …
297} 403}
298 404
299sub check_size { 405sub check_size {
300 my ($self) = @_; 406 my ($self) = @_;
301 407
302 return unless $self->{parent}; 408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
303 412
304 my ($w, $h) = $self->size_request; 413 $check_size->{$self} = $self;
305 414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self};
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
306 if ($w != $self->{req_w} || $h != $self->{req_h}) { 436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w; 437 $self->{req_w} = $w;
308 $self->{req_h} = $h; 438 $self->{req_h} = $h;
309 439
310 $self->{parent}->check_size; 440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
311 } 449 }
312} 450}
313 451
314sub update { 452sub update {
315 my ($self) = @_; 453 my ($self) = @_;
316 454
317 $self->{parent}->update 455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
318 if $self->{parent}; 456
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
319} 468}
320 469
321sub connect { 470sub connect {
322 my ($self, $signal, $cb) = @_; 471 my ($self, $signal, $cb) = @_;
323 472
… …
325} 474}
326 475
327sub emit { 476sub emit {
328 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
329 478
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
331 $cb->($self, @args);
332 }
333} 480}
334 481
335sub DESTROY { 482sub DESTROY {
336 my ($self) = @_; 483 my ($self) = @_;
337 484
… …
404sub new { 551sub new {
405 my ($class, %arg) = @_; 552 my ($class, %arg) = @_;
406 553
407 my $children = delete $arg{children} || []; 554 my $children = delete $arg{children} || [];
408 555
409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 556 my $self = $class->SUPER::new (
557 children => [],
558 can_events => 0,
559 %arg,
560 );
410 $self->add ($_) for @$children; 561 $self->add ($_) for @$children;
411 562
412 $self 563 $self
413} 564}
414 565
415sub add { 566sub add {
416 my ($self, $child) = @_; 567 my ($self, @widgets) = @_;
417 568
418 $child->set_parent ($self); 569 $_->set_parent ($self)
570 for @widgets;
419 571
420 use sort 'stable'; 572 use sort 'stable';
421 573
422 $self->{children} = [ 574 $self->{children} = [
423 sort { $a->{z} <=> $b->{z} } 575 sort { $a->{z} <=> $b->{z} }
424 @{$self->{children}}, $child 576 @{$self->{children}}, @widgets
425 ]; 577 ];
426 578
427 $child->check_size; 579 $_->check_size
580 for @widgets;
581
582 $self->update;
583}
584
585sub children {
586 @{ $_[0]{children} }
428} 587}
429 588
430sub remove { 589sub remove {
431 my ($self, $child) = @_; 590 my ($self, $child) = @_;
432 591
433 delete $child->{parent}; 592 delete $child->{parent};
593 $child->hide;
434 594
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 596
437 $self->check_size; 597 $self->check_size;
598 $self->update;
599}
600
601sub clear {
602 my ($self) = @_;
603
604 my $children = delete $self->{children};
605 $self->{children} = [];
606
607 for (@$children) {
608 delete $_->{parent};
609 $_->hide;
610 }
611
612 $self->check_size;
613 $self->update;
438} 614}
439 615
440sub find_widget { 616sub find_widget {
441 my ($self, $x, $y) = @_; 617 my ($self, $x, $y) = @_;
442 618
… …
517} 693}
518 694
519sub update { 695sub update {
520 my ($self) = @_; 696 my ($self) = @_;
521 697
522 # we want to do this delayed... 698 $ROOT->on_refresh ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 699 $self->SUPER::update;
525}
526
527sub render_chld {
528 my ($self) = @_;
529
530 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
531 glClearColor 0, 0, 0, 1;
532 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw;
534 };
535} 700}
536 701
537sub size_allocate { 702sub size_allocate {
538 my ($self, $w, $h) = @_; 703 my ($self, $w, $h) = @_;
539 704
540 $self->child->configure (0, 0, $w, $h); 705 $self->SUPER::size_allocate ($w, $h);
706 $self->update;
707}
541 708
709sub _render {
710 $_[0]{children}[0]->draw;
711}
712
713sub render_child {
714 my ($self) = @_;
715
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT;
719
542 $self->render_chld; 720 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 };
543} 729}
544 730
545sub _draw { 731sub _draw {
546 my ($self) = @_; 732 my ($self) = @_;
547 733
… …
549 735
550 my $tex = $self->{texture} 736 my $tex = $self->{texture}
551 or return; 737 or return;
552 738
553 glEnable GL_BLEND; 739 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1;
557 744
558 $tex->draw_quad (0, 0, $w, $h); 745 $tex->draw_quad (0, 0, $w, $h);
559 746
560 glDisable GL_BLEND; 747 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 748 glDisable GL_TEXTURE_2D;
… …
565 752
566package CFClient::UI::ViewPort; 753package CFClient::UI::ViewPort;
567 754
568our @ISA = CFClient::UI::Window::; 755our @ISA = CFClient::UI::Window::;
569 756
570sub new { die }
571
572sub size_request { 757sub size_request {
573 my ($self) = @_; 758 my ($self) = @_;
574 759
575 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
577 762
578 @$self{qw(child_w child_h)} 763 @$self{qw(child_w child_h)}
579} 764}
580 765
581sub _draw { 766sub size_allocate {
582 my ($self) = @_; 767 my ($self, $w, $h) = @_;
583 768
584 $self->{children}[1]->draw; 769 $self->update;
585} 770}
586 771
772sub set_offset {
773 my ($self, $x, $y) = @_;
774
775 $self->{view_x} = int $x;
776 $self->{view_y} = int $y;
777
778 $self->update;
779}
780
781# hmm, this does not work for topleft of $self... but we should not aks for that
782sub _topleft {
783 my ($self, $x, $y) = @_;
784
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
786}
787
788sub find_widget {
789 my ($self, $x, $y) = @_;
790
791 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
792 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
793 ) {
794 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
795 } else {
796 $self->CFClient::UI::Base::find_widget ($x, $y)
797 }
798}
799
800sub _render {
801 my ($self) = @_;
802
803 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
804
805 $self->SUPER::_render;
806}
807
808#############################################################################
809
810package CFClient::UI::ScrolledWindow;
811
812our @ISA = CFClient::UI::HBox::;
813
814sub new {
815 my $class = shift;
816
817 my $self;
818
819 my $slider = new CFClient::UI::Slider
820 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
824 },
825 ;
826
827 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort),
829 slider => $slider,
830 @_,
831 );
832
833 $self->{vp}->add ($self->{scrolled});
834 $self->add ($self->{vp});
835 $self->add ($self->{slider});
836
837 $self
838}
839
840#TODO# update range on size_allocate depeneing on child
841# update viewport offset on scroll
587 842
588############################################################################# 843#############################################################################
589 844
590package CFClient::UI::Frame; 845package CFClient::UI::Frame;
591 846
… …
602 border => 0.8, 857 border => 0.8,
603 @_ 858 @_
604 ); 859 );
605 860
606 $self 861 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614}
615
616sub size_request {
617 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h})
619}
620
621sub size_allocate {
622 my ($self, $w, $h) = @_;
623 $self->{w} = $w;
624 $self->{h} = $h;
625 $self->child->configure (0, 0, $w, $h);
626} 862}
627 863
628sub _draw { 864sub _draw {
629 my ($self) = @_; 865 my ($self) = @_;
630 866
… …
665 my $class = shift; 901 my $class = shift;
666 902
667 # TODO: user_x, user_y, overwrite moveto? 903 # TODO: user_x, user_y, overwrite moveto?
668 904
669 my $self = $class->SUPER::new ( 905 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 906 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 907 border_bg => [1, 1, 1, 1],
672 border => 0.8, 908 border => 0.6,
673 can_events => 1, 909 can_events => 1,
674 @_ 910 @_
675 ); 911 );
676 912
677 $self->{title} &&= new CFClient::UI::Label 913 $self->{title} &&= new CFClient::UI::Label
678 align => 0, 914 align => 0,
679 valign => 1, 915 valign => 1,
680 text => $self->{title}, 916 text => $self->{title},
681 fontsize => 1; 917 fontsize => $self->{border};
682 918
683 $self 919 $self
684} 920}
685 921
686sub border { 922sub border {
687 int $_[0]{border} * $::FONTSIZE 923 int $_[0]{border} * $::FONTSIZE
688} 924}
689 925
690sub size_request { 926sub size_request {
691 my ($self) = @_; 927 my ($self) = @_;
692
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694 928
695 my ($w, $h) = $self->SUPER::size_request; 929 my ($w, $h) = $self->SUPER::size_request;
696 930
697 ( 931 (
698 $w + $self->border * 2, 932 $w + $self->border * 2,
… …
713} 947}
714 948
715sub button_down { 949sub button_down {
716 my ($self, $ev, $x, $y) = @_; 950 my ($self, $ev, $x, $y) = @_;
717 951
952 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 953 my $border = $self->border;
719 954
720 if ($x < $self->{w} && $x >= $self->{w} - $border 955 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 956 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 957
958 if ($lr & $td) {
959 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 960 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 961 my ($bw, $bh) = ($self->{w}, $self->{h});
725 962
963 my $mx = $x < $border;
964 my $my = $y < $border;
965
726 $self->{motion} = sub { 966 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 967 my ($ev, $x, $y) = @_;
728 968
729 ($x, $y) = ($ev->{x}, $ev->{y}); 969 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy;
730 971
731 $self->{user_w} = $bw + $x - $ox; 972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
733 $self->check_size; 975 $self->check_size;
734 }; 976 };
735 977
736 } elsif ($x >= 0 && $x < $self->{w} 978 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 979 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 980 my ($bx, $by) = ($self->{x}, $self->{y});
741 981
742 $self->{motion} = sub { 982 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 983 my ($ev, $x, $y) = @_;
… …
779 $tex[1]->draw_quad (0, 0, $w, $border); 1019 $tex[1]->draw_quad (0, 0, $w, $border);
780 $tex[3]->draw_quad (0, $border, $border, $ch); 1020 $tex[3]->draw_quad (0, $border, $border, $ch);
781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
782 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1022 $tex[4]->draw_quad (0, $h - $border, $w, $border);
783 1023
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
784 my $bg = $tex[0]; 1025 my $bg = $tex[0];
785 1026
786 # TODO: repeat texture not scale 1027 # TODO: repeat texture not scale
787 my $rep_x = $cw / $bg->{w}; 1028 my $rep_x = $cw / $bg->{w};
788 my $rep_y = $ch / $bg->{h}; 1029 my $rep_y = $ch / $bg->{h};
789 1030
790 glColor @{ $self->{bg} }; 1031 glColor @{ $self->{bg} };
791 1032
792 $bg->{s} = $rep_x; 1033 $bg->{s} = $rep_x;
793 $bg->{t} = $rep_y; 1034 $bg->{t} = $rep_y;
794 $bg->{wrap_mode} = 1; 1035 $bg->{wrap_mode} = 1;
795 $bg->draw_quad ($border, $border, $cw, $ch); 1036 $bg->draw_quad ($border, $border, $cw, $ch);
796 1037
797 glDisable GL_TEXTURE_2D; 1038 glDisable GL_TEXTURE_2D;
798 glDisable GL_BLEND; 1039 glDisable GL_BLEND;
1040 }
799 1041
800 $self->{title}->draw if $self->{title}; 1042 $self->{title}->draw if $self->{title};
1043
801 $self->child->draw; 1044 $self->child->draw;
802} 1045}
803 1046
804############################################################################# 1047#############################################################################
805 1048
… …
827 $self->{children}[$y][$x] = $child; 1070 $self->{children}[$y][$x] = $child;
828 1071
829 $child->check_size; 1072 $child->check_size;
830} 1073}
831 1074
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
832# TODO: move to container class maybe? send childs a signal on removal? 1079# TODO: move to container class maybe? send childs a signal on removal?
833sub clear { 1080sub clear {
834 my ($self) = @_; 1081 my ($self) = @_;
835 1082
1083 my @children = $self->children;
836 delete $self->{children}; 1084 delete $self->{children};
1085
1086 for (@children) {
1087 delete $_->{parent};
1088 $_->hide;
1089 }
1090
837 $self->update; 1091 $self->update;
838} 1092}
839 1093
840sub get_wh { 1094sub get_wh {
841 my ($self) = @_; 1095 my ($self) = @_;
… …
1064 1318
1065sub new { 1319sub new {
1066 my ($class, %arg) = @_; 1320 my ($class, %arg) = @_;
1067 1321
1068 my $self = $class->SUPER::new ( 1322 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1323 fg => [1, 1, 1],
1324 #font => default_font
1070 fontsize => 1, 1325 fontsize => 1,
1071 text => "", 1326 text => "",
1072 align => -1, 1327 align => -1,
1073 valign => -1, 1328 valign => -1,
1074 padding => 2, 1329 padding => 2,
1075 layout => new CFClient::Layout, 1330 layout => new CFClient::Layout,
1076 can_events => 0, 1331 can_events => 0,
1077 %arg 1332 %arg
1078 ); 1333 );
1079 1334
1080 if (exists $self->{template}) { 1335 if (exists $self->{template}) {
… …
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1088 1343
1089 $self 1344 $self
1090} 1345}
1091 1346
1092sub escape_text { 1347sub escape {
1093 local $_ = $_[1]; 1348 local $_ = $_[1];
1094 1349
1095 s/&/&amp;/g; 1350 s/&/&amp;/g;
1096 s/>/&gt;/g; 1351 s/>/&gt;/g;
1097 s/</&lt;/g; 1352 s/</&lt;/g;
1098 1353
1099 $_[1] 1354 $_[1]
1100} 1355}
1101 1356
1357sub update {
1358 my ($self) = @_;
1359
1360 delete $self->{texture};
1361 $self->SUPER::update;
1362}
1363
1102sub set_text { 1364sub set_text {
1103 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1104 1366
1367 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text";
1369
1105 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1106 1371
1107 delete $self->{texture}; 1372 delete $self->{texture};
1373 $self->update;
1108 $self->check_size; 1374 $self->check_size;
1109 $self->update;
1110} 1375}
1111 1376
1112sub set_markup { 1377sub set_markup {
1113 my ($self, $markup) = @_; 1378 my ($self, $markup) = @_;
1114 1379
1380 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup";
1382
1115 $self->{layout}->set_markup ($markup); 1383 $self->{layout}->set_markup ($markup);
1116 1384
1117 delete $self->{texture}; 1385 delete $self->{texture};
1386 $self->update;
1118 $self->check_size; 1387 $self->check_size;
1119 $self->update;
1120} 1388}
1121 1389
1122sub size_request { 1390sub size_request {
1123 my ($self) = @_; 1391 my ($self) = @_;
1124 1392
1125 $self->{layout}->set_width; 1393 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1);
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1396
1128 my ($w, $h) = $self->{layout}->size; 1397 my ($w, $h) = $self->{layout}->size;
1129 1398
1130 if (exists $self->{template}) { 1399 if (exists $self->{template}) {
1400 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1401 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1402
1133 my ($w2, $h2) = $self->{template}->size; 1403 my ($w2, $h2) = $self->{template}->size;
1134 1404
1135 $w = List::Util::max $w, $w2; 1405 $w = List::Util::max $w, $w2;
… …
1150 1420
1151sub set_fontsize { 1421sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1422 my ($self, $fontsize) = @_;
1153 1423
1154 $self->{fontsize} = $fontsize; 1424 $self->{fontsize} = $fontsize;
1425 delete $self->{texture};
1426
1427 $self->update;
1155 $self->check_size; 1428 $self->check_size;
1156} 1429}
1157 1430
1158sub _draw { 1431sub _draw {
1159 my ($self) = @_; 1432 my ($self) = @_;
1160 1433
1161 my $tex = $self->{texture} ||= do { 1434 my $tex = $self->{texture} ||= do {
1435 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1436 $self->{layout}->set_width ($self->{w});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1164 new_from_layout CFClient::Texture $self->{layout} 1438 new_from_layout CFClient::Texture $self->{layout}
1165 }; 1439 };
1166 1440
… …
1199 1473
1200sub new { 1474sub new {
1201 my $class = shift; 1475 my $class = shift;
1202 1476
1203 $class->SUPER::new ( 1477 $class->SUPER::new (
1204 fg => [1, 1, 1], 1478 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1479 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1480 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1481 active_fg => [0, 0, 0],
1208 can_hover => 1, 1482 can_hover => 1,
1209 can_focus => 1, 1483 can_focus => 1,
1210 valign => 0, 1484 valign => 0,
1211 can_events => 1, 1485 can_events => 1,
1212 @_ 1486 @_
1213 ) 1487 )
1214} 1488}
1215 1489
… …
1369 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1370 1644
1371 my $sym = $ev->{sym}; 1645 my $sym = $ev->{sym};
1372 1646
1373 if ($sym == 13) { 1647 if ($sym == 13) {
1648 unshift @{$self->{history}},
1649 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = '';
1374 $self->emit (activate => $self->get_text); 1652 $self->emit (activate => $txt);
1375 $self->update; 1653 $self->update;
1654
1655 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text;
1658 }
1659 if (@{$self->{history} || []} > 0) {
1660 $self->{history_pointer}++;
1661 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1662 $self->{history_pointer} = @{$self->{history} || []} - 1;
1663 }
1664 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1665 }
1666
1667 } elsif ($sym == CFClient::SDLK_DOWN) {
1668 $self->{history_pointer}--;
1669 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1670
1671 if ($self->{history_pointer} >= 0) {
1672 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1673 } else {
1674 $self->set_text ($self->{history_saveback});
1675 }
1376 1676
1377 } else { 1677 } else {
1378 $self->SUPER::key_down ($ev); 1678 $self->SUPER::key_down ($ev);
1379 } 1679 }
1380 1680
… …
1394 1694
1395sub new { 1695sub new {
1396 my $class = shift; 1696 my $class = shift;
1397 1697
1398 $class->SUPER::new ( 1698 $class->SUPER::new (
1399 padding => 4, 1699 padding => 4,
1400 fg => [1, 1, 1], 1700 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2], 1701 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1702 active_fg => [0, 0, 1],
1403 can_hover => 1, 1703 can_hover => 1,
1404 align => 0, 1704 align => 0,
1405 valign => 0, 1705 valign => 0,
1406 can_events => 1, 1706 can_events => 1,
1407 @_ 1707 @_
1408 ) 1708 )
1409} 1709}
1410 1710
… …
1569 1869
1570package CFClient::UI::VGauge; 1870package CFClient::UI::VGauge;
1571 1871
1572our @ISA = CFClient::UI::Base::; 1872our @ISA = CFClient::UI::Base::;
1573 1873
1874use List::Util qw(min max);
1875
1574use CFClient::OpenGL; 1876use CFClient::OpenGL;
1575 1877
1576my %tex = ( 1878my %tex = (
1577 food => [ 1879 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1881 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1882 ],
1581 grace => [ 1883 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1885 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1584 ], 1886 ],
1585 hp => [ 1887 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1889 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1890 ],
1589 mana => [ 1891 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1892 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1893 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1592 ], 1894 ],
1593); 1895);
1594 1896
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1897# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 1898sub new {
… …
1615} 1917}
1616 1918
1617sub set_max { 1919sub set_max {
1618 my ($self, $max) = @_; 1920 my ($self, $max) = @_;
1619 1921
1922 return if $self->{max_val} == $max;
1923
1620 $self->{max_val} = $max; 1924 $self->{max_val} = $max;
1925 $self->update;
1621} 1926}
1622 1927
1623sub set_value { 1928sub set_value {
1624 my ($self, $val, $max) = @_; 1929 my ($self, $val, $max) = @_;
1625 1930
1626 $self->set_max ($max) 1931 $self->set_max ($max)
1627 if defined $max; 1932 if defined $max;
1628 1933
1629 $max = $self->{max_val}; 1934 return if $self->{val} == $val;
1935
1630 $self->{val} = $val; 1936 $self->{val} = $val;
1631
1632 $self->update; 1937 $self->update;
1633} 1938}
1634 1939
1635sub _draw { 1940sub _draw {
1636 my ($self) = @_; 1941 my ($self) = @_;
1637 1942
1638 my $tex = $tex{$self->{type}}; 1943 my $tex = $tex{$self->{type}};
1944 my ($t1, $t2, $t3) = @$tex;
1639 1945
1640 my ($w, $h) = ($self->{w}, $self->{h}); 1946 my ($w, $h) = ($self->{w}, $self->{h});
1641 1947
1642 if ($self->{vertical}) { 1948 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 1949 glRotate 90, 0, 0, 1;
… …
1645 1951
1646 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1647 } 1953 }
1648 1954
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 1955 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 1956
1652 my $t1 = $tex->[0]; 1957 my $ycut1 = max 0, min 1, $ycut;
1653 my $t2 = $tex->[1]; 1958 my $ycut2 = max 0, min 1, $ycut - 1;
1959
1960 my $h1 = $self->{h} * (1 - $ycut1);
1961 my $h2 = $self->{h} * (1 - $ycut2);
1654 1962
1655 glEnable GL_BLEND; 1963 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 1967
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1968 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 1969 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 1970 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1971 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1972 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1973 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 1974 glEnd;
1670 1975
1976 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1977 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 1978 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1979 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1980 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1981 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1982 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 glEnd; 1983 glEnd;
1984
1985 if ($t3) {
1986 glBindTexture GL_TEXTURE_2D, $t3->{name};
1987 glBegin GL_QUADS;
1988 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1989 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1990 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1991 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1992 glEnd;
1993 }
1678 1994
1679 glDisable GL_BLEND; 1995 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 1996 glDisable GL_TEXTURE_2D;
1681} 1997}
1682 1998
… …
1685package CFClient::UI::Gauge; 2001package CFClient::UI::Gauge;
1686 2002
1687our @ISA = CFClient::UI::VBox::; 2003our @ISA = CFClient::UI::VBox::;
1688 2004
1689sub new { 2005sub new {
1690 my ($class, %arg) = shift; 2006 my ($class, %arg) = @_;
1691 2007
1692 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1693 @_, 2009 tooltip => $arg{type},
2010 can_hover => 1,
2011 can_events => 1,
2012 %arg,
1694 ); 2013 );
1695 2014
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2015 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2016 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2017 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 2018
1702 $self 2019 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 2020}
1709 2021
1710sub set_fontsize { 2022sub set_fontsize {
1711 my ($self, $fsize) = @_; 2023 my ($self, $fsize) = @_;
1712 2024
1713 $self->{value}->set_fontsize ($fsize); 2025 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 2026 $self->{max} ->set_fontsize ($fsize);
1715} 2027}
1716 2028
2029sub set_max {
2030 my ($self, $max) = @_;
2031
2032 $self->{gauge}->set_max ($max);
2033 $self->{max}->set_text ($max);
2034}
2035
1717sub set_value { 2036sub set_value {
1718 my ($self, $val, $max) = @_; 2037 my ($self, $val, $max) = @_;
1719 2038
1720 $self->set_max ($max) 2039 $self->set_max ($max)
1721 if defined $max; 2040 if defined $max;
1722 2041
1723 $self->{gauge}->set_value ($val, $max); 2042 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 2043 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 2044}
1733 2045
1734############################################################################# 2046#############################################################################
1735 2047
1736package CFClient::UI::Slider; 2048package CFClient::UI::Slider;
… …
1755 # TODO: calculations are off 2067 # TODO: calculations are off
1756 my $self = $class->SUPER::new ( 2068 my $self = $class->SUPER::new (
1757 fg => [1, 1, 1], 2069 fg => [1, 1, 1],
1758 active_fg => [0, 0, 0], 2070 active_fg => [0, 0, 0],
1759 range => [0, 0, 100, 10], 2071 range => [0, 0, 100, 10],
1760 req_w => 20, 2072 req_w => $::WIDTH / 80,
1761 req_h => 20, 2073 req_h => $::WIDTH / 80,
1762 vertical => 0, 2074 vertical => 0,
1763 can_hover => 1, 2075 can_hover => 1,
1764 inner_pad => 5, 2076 inner_pad => 5,
1765 @_ 2077 @_
1766 ); 2078 );
… …
1876 2188
1877sub new { 2189sub new {
1878 my $class = shift; 2190 my $class = shift;
1879 2191
1880 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1881 fontsize => 1, 2193 fontsize => 1,
2194 can_events => 0,
2195 #font => default_font
1882 @_, 2196 @_,
1883 2197
1884 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout),
1885 par => [], 2199 par => [],
1886 height => 0, 2200 height => 0,
1887 children => [ 2201 children => [
1888 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
1890 ], 2204 ],
1891 ); 2205 );
1892 2206
1893 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2208
1897 $self 2209 $self
1898} 2210}
1899 2211
1900sub set_fontsize { 2212sub set_fontsize {
… …
1908 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
1909 2221
1910 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
1911 2223
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
1914 $layout->set_text ($text); 2226 $layout->set_text ($text);
1915 2227
1916 ($layout->size)[1] 2228 ($layout->size)[1]
1917} 2229}
1918 2230
… …
1926sub size_allocate { 2238sub size_allocate {
1927 my ($self, $w, $h) = @_; 2239 my ($self, $w, $h) = @_;
1928 2240
1929 $self->SUPER::size_allocate ($w, $h); 2241 $self->SUPER::size_allocate ($w, $h);
1930 2242
2243 $self->{layout}->set_font ($self->{font}) if $self->{font};
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1932 $self->{layout}->set_width ($self->{children}[0]{w}); 2245 $self->{layout}->set_width ($self->{children}[0]{w});
1933 2246
1934 $self->reflow; 2247 $self->reflow;
1935} 2248}
… …
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1971 2284
1972 delete $self->{texture}; 2285 delete $self->{texture};
1973 } 2286 }
1974 2287
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1976 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
1978 2291
1979 glEnable GL_BLEND; 2292 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
… …
1988 2301
1989 my $y = 0; 2302 my $y = 0;
1990 2303
1991 my $layout = $self->{layout}; 2304 my $layout = $self->{layout};
1992 2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307
1993 for my $par (@{$self->{par}}) { 2308 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2309 my $h = $par->[0];
1995 2310
1996 if ($y0 < $y + $h && $y < $y1) { 2311 if ($y0 < $y + $h && $y < $y1) {
1997 $layout->set_text ($par->[2]); 2312 $layout->set_text ($par->[2]);
… …
2011} 2326}
2012 2327
2013sub _draw { 2328sub _draw {
2014 my ($self) = @_; 2329 my ($self) = @_;
2015 2330
2016 if ($self->{texture}) { 2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2017 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
2018 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1;
2019 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2020 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
2021 } 2338 glDisable GL_BLEND;
2022 2339
2023 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2024 2341
2025} 2342}
2026 2343
… …
2074 2391
2075sub new { 2392sub new {
2076 my $class = shift; 2393 my $class = shift;
2077 2394
2078 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
2079 state => 0, 2396 state => 0,
2080 connect_activate => \&toggle_flopper, 2397 connect_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2398 @_
2083 ); 2399 );
2084 2400
2085 if ($self->{state}) { 2401 if ($self->{state}) {
2086 $self->{state} = 0; 2402 $self->{state} = 0;
… …
2106 $self->emit (changed => $self->{state}); 2422 $self->emit (changed => $self->{state});
2107} 2423}
2108 2424
2109############################################################################# 2425#############################################################################
2110 2426
2427package CFClient::UI::Tooltip;
2428
2429our @ISA = CFClient::UI::Bin::;
2430
2431use CFClient::OpenGL;
2432
2433sub new {
2434 my $class = shift;
2435
2436 $class->SUPER::new (
2437 @_,
2438 can_events => 0,
2439 )
2440}
2441
2442sub set_markup {
2443 my ($self, $text) = @_;
2444
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2446 $self->{label}->set_markup ($text);
2447 $self->add ($self->{label});
2448}
2449
2450sub size_request {
2451 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456
2457 ($w + 4, $h + 4)
2458}
2459
2460sub size_allocate {
2461 my ($self, $w, $h) = @_;
2462
2463 $self->SUPER::size_allocate ($w - 4, $h - 4);
2464}
2465
2466sub _draw {
2467 my ($self) = @_;
2468
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375;
2471
2472 my ($w, $h) = @$self{qw(w h)};
2473
2474 glColor 1, 0.8, 0.4;
2475 glBegin GL_QUADS;
2476 glVertex 0 , 0;
2477 glVertex 0 , $h;
2478 glVertex $w, $h;
2479 glVertex $w, 0;
2480 glEnd;
2481
2482 glColor 0, 0, 0;
2483 glBegin GL_LINE_LOOP;
2484 glVertex 0 , 0;
2485 glVertex 0 , $h;
2486 glVertex $w, $h;
2487 glVertex $w, 0;
2488 glEnd;
2489
2490 glPopMatrix;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw;
2494}
2495
2496#############################################################################
2497
2498package CFClient::UI::Face;
2499
2500our @ISA = CFClient::UI::Base::;
2501
2502use CFClient::OpenGL;
2503
2504sub new {
2505 my $class = shift;
2506
2507 $class->SUPER::new (
2508 aspect => 1,
2509 @_,
2510 )
2511}
2512
2513sub size_request {
2514 (32, 8)
2515}
2516
2517sub _draw {
2518 my ($self) = @_;
2519
2520 return unless $::CONN;#d# manage and cache textures differently
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2522
2523 # TODO animation
2524 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 }
2534}
2535
2536#############################################################################
2537
2538package CFClient::UI::InventoryItem;
2539
2540our @ISA = CFClient::UI::HBox::;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new (
2555 can_hover => 1,
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_,
2610 );
2611
2612 $self
2613}
2614
2615sub set_items {
2616 my ($self, $items) = @_;
2617
2618 $self->{scrolled}->clear;
2619 return unless $items;
2620
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2622
2623 $self->{real_items} = \@items;
2624
2625 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2631 }
2632
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h});
2639}
2640
2641#############################################################################
2642
2643package CFClient::UI::Menu;
2644
2645our @ISA = CFClient::UI::FancyFrame::;
2646
2647use CFClient::OpenGL;
2648
2649sub new {
2650 my $class = shift;
2651
2652 my $self = $class->SUPER::new (
2653 items => [],
2654 z => 100,
2655 @_,
2656 );
2657
2658 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2659
2660 for my $item (@{ $self->{items} }) {
2661 my ($widget, $cb) = @$item;
2662
2663 # handle various types of items, only text for now
2664 if (!ref $widget) {
2665 $widget = new CFClient::UI::Label
2666 can_hover => 1,
2667 can_events => 1,
2668 text => $widget;
2669 }
2670
2671 $self->{item}{$widget} = $item;
2672
2673 $self->{vbox}->add ($widget);
2674 }
2675
2676 $self
2677}
2678
2679# popup given the event (must be a mouse button down event currently)
2680sub popup {
2681 my ($self, $ev) = @_;
2682
2683 $self->emit ("popdown");
2684
2685 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self;
2687 $self->{button} = $ev->{button};
2688
2689 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691}
2692
2693sub mouse_motion {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # TODO: should use vbox->find_widget or so
2697 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2698 $self->{hover} = $self->{item}{$HOVER};
2699}
2700
2701sub button_up {
2702 my ($self, $ev, $x, $y) = @_;
2703
2704 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB;
2706 $self->hide;
2707
2708 $self->emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover};
2710 }
2711}
2712
2713#############################################################################
2714
2111package CFClient::UI::Root; 2715package CFClient::UI::Root;
2112 2716
2113our @ISA = CFClient::UI::Container::; 2717our @ISA = CFClient::UI::Container::;
2114 2718
2115use CFClient::OpenGL; 2719use CFClient::OpenGL;
2116 2720
2117sub check_size { 2721sub check_size {
2118 my ($self) = @_; 2722 my ($self) = @_;
2119 2723
2120 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2724 $self->configure (0, 0, $self->{w}, $self->{h});
2121} 2725}
2122 2726
2123sub size_request { 2727sub size_request {
2124 ($::WIDTH, $::HEIGHT) 2728 my ($self) = @_;
2729
2730 ($self->{w}, $self->{h})
2731}
2732
2733sub size_allocate {
2734 my ($self, $w, $h) = @_;
2735
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2125} 2754}
2126 2755
2127sub configure { 2756sub configure {
2128 my ($self, $x, $y, $w, $h) = @_; 2757 my ($self, $x, $y, $w, $h) = @_;
2129 2758
2130 $self->SUPER::configure ($x, $y, $w, $h); 2759 $self->SUPER::configure ($x, $y, $w, $h);
2131 2760
2132 for my $child (@{$self->{children}}) { 2761 for my $child ($self->children) {
2133 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2134 2763
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2764 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2136 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2137 $child->configure ($X, $Y, $W,$H); 2766 $child->configure ($X, $Y, $W, $H);
2138 } 2767 }
2139} 2768}
2140 2769
2141sub _topleft { 2770sub _topleft {
2142 my ($self, $x, $y) = @_; 2771 my ($self, $x, $y) = @_;
… …
2190############################################################################# 2819#############################################################################
2191 2820
2192package CFClient::UI; 2821package CFClient::UI;
2193 2822
2194$ROOT = new CFClient::UI::Root; 2823$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip;
2195 2825
21961 28261
2197 2827

Diff Legend

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