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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.186 by root, Mon May 8 20:39:34 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
170 $self->{w} = $w; 237 $self->{w} = $w;
171 $self->{h} = $h; 238 $self->{h} = $h;
172 239
173 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
174 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
175 } 243 }
176} 244}
177 245
178sub size_allocate { 246sub size_allocate {
179 # 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;
180} 270}
181 271
182# return top left coordinates 272# return top left coordinates
183sub _topleft { 273sub _topleft {
184 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
185 278
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 280}
188 281
189# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 360 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 361 glVertex $x , $y + $self->{h};
269 glEnd; 362 glEnd;
270 glDisable GL_BLEND; 363 glDisable GL_BLEND;
271 } 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 }
272} 379}
273 380
274sub _draw { 381sub _draw {
275 my ($self) = @_; 382 my ($self) = @_;
276 383
277 warn "no draw defined for $self\n"; 384 warn "no draw defined for $self\n";
278} 385}
279 386
280sub find_widget { 387sub find_widget {
281 my ($self, $x, $y) = @_; 388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
282 391
283 return $self 392 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 395
… …
294} 403}
295 404
296sub check_size { 405sub check_size {
297 my ($self) = @_; 406 my ($self) = @_;
298 407
299 my ($w, $h) = $self->size_request; 408 $self->{parent}
409 or return 1;
300 410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 416 $self->{req_w} = $w;
303 $self->{req_h} = $h; 417 $self->{req_h} = $h;
304 418
305 $self->{parent}->check_size 419 $self->{parent}->check_size
306 if $self->{parent}; 420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
307 } 428 }
308} 429}
309 430
310sub update { 431sub update {
311 my ($self) = @_; 432 my ($self) = @_;
… …
321} 442}
322 443
323sub emit { 444sub emit {
324 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
325 446
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 448}
330 449
331sub DESTROY { 450sub DESTROY {
332 my ($self) = @_; 451 my ($self) = @_;
333 452
… …
378 497
379package CFClient::UI::Empty; 498package CFClient::UI::Empty;
380 499
381our @ISA = CFClient::UI::Base::; 500our @ISA = CFClient::UI::Base::;
382 501
502sub new {
503 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg);
505}
506
383sub size_request { 507sub size_request {
384 (0, 0) 508 (0, 0)
385} 509}
386 510
387sub draw { } 511sub draw { }
… …
395sub new { 519sub new {
396 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
397 521
398 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
399 523
400 my $self = $class->SUPER::new (children => [], %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
401 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
402 530
403 $self 531 $self
404} 532}
405 533
… …
414 sort { $a->{z} <=> $b->{z} } 542 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 543 @{$self->{children}}, $child
416 ]; 544 ];
417 545
418 $child->check_size; 546 $child->check_size;
547 $self->update;
548}
549
550sub children {
551 @{ $_[0]{children} }
419} 552}
420 553
421sub remove { 554sub remove {
422 my ($self, $child) = @_; 555 my ($self, $child) = @_;
423 556
424 delete $child->{parent}; 557 delete $child->{parent};
558 $child->hide;
425 559
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 561
428 $self->check_size; 562 $self->check_size;
563 $self->update;
564}
565
566sub clear {
567 my ($self) = @_;
568
569 my $children = delete $self->{children};
570 $self->{children} = [];
571
572 for (@$children) {
573 delete $_->{parent};
574 $_->hide;
575 }
576
577 $self->check_size;
578 $self->update;
429} 579}
430 580
431sub find_widget { 581sub find_widget {
432 my ($self, $x, $y) = @_; 582 my ($self, $x, $y) = @_;
433 583
… …
508} 658}
509 659
510sub update { 660sub update {
511 my ($self) = @_; 661 my ($self) = @_;
512 662
513 # we want to do this delayed... 663 $ROOT->on_refresh ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 664 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 665}
527 666
528sub size_allocate { 667sub size_allocate {
529 my ($self, $w, $h) = @_; 668 my ($self, $w, $h) = @_;
530 669
531 $self->child->configure (0, 0, $w, $h); 670 $self->SUPER::size_allocate ($w, $h);
671 $self->update;
672}
532 673
674sub _render {
675 $_[0]{children}[0]->draw;
676}
677
678sub render_child {
679 my ($self) = @_;
680
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT;
684
533 $self->render_chld; 685 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 };
534} 694}
535 695
536sub _draw { 696sub _draw {
537 my ($self) = @_; 697 my ($self) = @_;
538 698
… …
540 700
541 my $tex = $self->{texture} 701 my $tex = $self->{texture}
542 or return; 702 or return;
543 703
544 glEnable GL_BLEND; 704 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 706 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1;
548 709
549 $tex->draw_quad (0, 0, $w, $h); 710 $tex->draw_quad (0, 0, $w, $h);
550 711
551 glDisable GL_BLEND; 712 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
… …
556 717
557package CFClient::UI::ViewPort; 718package CFClient::UI::ViewPort;
558 719
559our @ISA = CFClient::UI::Window::; 720our @ISA = CFClient::UI::Window::;
560 721
561sub new { die }
562
563sub size_request { 722sub size_request {
564 my ($self) = @_; 723 my ($self) = @_;
565 724
566 @$self{qw(child_w child_h)} = $self->child->size_request; 725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
568 727
569 @$self{qw(child_w child_h)} 728 @$self{qw(child_w child_h)}
570} 729}
571 730
572sub _draw { 731sub size_allocate {
573 my ($self) = @_; 732 my ($self, $w, $h) = @_;
574 733
575 $self->{children}[1]->draw; 734 $self->update;
576} 735}
577 736
737sub set_offset {
738 my ($self, $x, $y) = @_;
739
740 $self->{view_x} = int $x;
741 $self->{view_y} = int $y;
742
743 $self->update;
744}
745
746# hmm, this does not work for topleft of $self... but we should not aks for that
747sub _topleft {
748 my ($self, $x, $y) = @_;
749
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
751}
752
753sub find_widget {
754 my ($self, $x, $y) = @_;
755
756 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
757 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
758 ) {
759 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
760 } else {
761 $self->CFClient::UI::Base::find_widget ($x, $y)
762 }
763}
764
765sub _render {
766 my ($self) = @_;
767
768 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
769
770 $self->SUPER::_render;
771}
772
773#############################################################################
774
775package CFClient::UI::ScrolledWindow;
776
777our @ISA = CFClient::UI::HBox::;
778
779sub new {
780 my $class = shift;
781
782 my $self;
783
784 my $slider = new CFClient::UI::Slider
785 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
789 },
790 ;
791
792 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort),
794 slider => $slider,
795 @_,
796 );
797
798 $self->{vp}->add ($self->{scrolled});
799 $self->add ($self->{vp});
800 $self->add ($self->{slider});
801
802 $self
803}
804
805#TODO# update range on size_allocate depeneing on child
806# update viewport offset on scroll
578 807
579############################################################################# 808#############################################################################
580 809
581package CFClient::UI::Frame; 810package CFClient::UI::Frame;
582 811
… …
593 border => 0.8, 822 border => 0.8,
594 @_ 823 @_
595 ); 824 );
596 825
597 $self 826 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605}
606
607sub size_request {
608 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h})
610}
611
612sub size_allocate {
613 my ($self, $w, $h) = @_;
614 $self->{w} = $w;
615 $self->{h} = $h;
616 $self->child->configure (0, 0, $w, $h);
617} 827}
618 828
619sub _draw { 829sub _draw {
620 my ($self) = @_; 830 my ($self) = @_;
621 831
… …
656 my $class = shift; 866 my $class = shift;
657 867
658 # TODO: user_x, user_y, overwrite moveto? 868 # TODO: user_x, user_y, overwrite moveto?
659 869
660 my $self = $class->SUPER::new ( 870 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 871 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 872 border_bg => [1, 1, 1, 1],
663 border => 0.8, 873 border => 0.6,
874 can_events => 1,
664 @_ 875 @_
665 ); 876 );
666 877
667 $self->{title} &&= new CFClient::UI::Label 878 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 879 align => 0,
669 valign => 1, 880 valign => 1,
670 text => $self->{title}, 881 text => $self->{title},
671 fontsize => 1; 882 fontsize => $self->{border};
672 883
673 $self 884 $self
674} 885}
675 886
676sub border { 887sub border {
677 int $_[0]{border} * $::FONTSIZE 888 int $_[0]{border} * $::FONTSIZE
678} 889}
679 890
680sub size_request { 891sub size_request {
681 my ($self) = @_; 892 my ($self) = @_;
682
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684 893
685 my ($w, $h) = $self->SUPER::size_request; 894 my ($w, $h) = $self->SUPER::size_request;
686 895
687 ( 896 (
688 $w + $self->border * 2, 897 $w + $self->border * 2,
… …
703} 912}
704 913
705sub button_down { 914sub button_down {
706 my ($self, $ev, $x, $y) = @_; 915 my ($self, $ev, $x, $y) = @_;
707 916
917 my ($w, $h) = @$self{qw(w h)};
708 my $border = $self->border; 918 my $border = $self->border;
709 919
710 if ($x < $self->{w} && $x >= $self->{w} - $border 920 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711 && $y < $self->{h} && $y >= $self->{h} - $border) { 921 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712 922
923 if ($lr & $td) {
924 my ($wx, $wy) = ($self->{x}, $self->{y});
713 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 925 my ($ox, $oy) = ($ev->{x}, $ev->{y});
714 my ($bw, $bh) = ($self->{w}, $self->{h}); 926 my ($bw, $bh) = ($self->{w}, $self->{h});
715 927
928 my $mx = $x < $border;
929 my $my = $y < $border;
930
716 $self->{motion} = sub { 931 $self->{motion} = sub {
717 my ($ev, $x, $y) = @_; 932 my ($ev, $x, $y) = @_;
718 933
719 ($x, $y) = ($ev->{x}, $ev->{y}); 934 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy;
720 936
721 $self->{user_w} = $bw + $x - $ox; 937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
722 $self->{user_h} = $bh + $y - $oy; 938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
723 $self->check_size; 940 $self->check_size;
724 }; 941 };
725 942
726 } elsif ($x >= 0 && $x < $self->{w} 943 } elsif ($lr ^ $td) {
727 && $y >= 0 && $y < $border) {
728
729 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 944 my ($ox, $oy) = ($ev->{x}, $ev->{y});
730 my ($bx, $by) = ($self->{x}, $self->{y}); 945 my ($bx, $by) = ($self->{x}, $self->{y});
731 946
732 $self->{motion} = sub { 947 $self->{motion} = sub {
733 my ($ev, $x, $y) = @_; 948 my ($ev, $x, $y) = @_;
… …
769 $tex[1]->draw_quad (0, 0, $w, $border); 984 $tex[1]->draw_quad (0, 0, $w, $border);
770 $tex[3]->draw_quad (0, $border, $border, $ch); 985 $tex[3]->draw_quad (0, $border, $border, $ch);
771 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
772 $tex[4]->draw_quad (0, $h - $border, $w, $border); 987 $tex[4]->draw_quad (0, $h - $border, $w, $border);
773 988
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
774 my $bg = $tex[0]; 990 my $bg = $tex[0];
775 991
776 # TODO: repeat texture not scale 992 # TODO: repeat texture not scale
777 my $rep_x = $cw / $bg->{w}; 993 my $rep_x = $cw / $bg->{w};
778 my $rep_y = $ch / $bg->{h}; 994 my $rep_y = $ch / $bg->{h};
779 995
780 glColor @{ $self->{bg} }; 996 glColor @{ $self->{bg} };
781 997
782 $bg->{s} = $rep_x; 998 $bg->{s} = $rep_x;
783 $bg->{t} = $rep_y; 999 $bg->{t} = $rep_y;
784 $bg->{wrap_mode} = 1; 1000 $bg->{wrap_mode} = 1;
785 $bg->draw_quad ($border, $border, $cw, $ch); 1001 $bg->draw_quad ($border, $border, $cw, $ch);
786 1002
787 glDisable GL_TEXTURE_2D; 1003 glDisable GL_TEXTURE_2D;
788 glDisable GL_BLEND; 1004 glDisable GL_BLEND;
1005 }
789 1006
790 $self->{title}->draw if $self->{title}; 1007 $self->{title}->draw if $self->{title};
1008
791 $self->child->draw; 1009 $self->child->draw;
792} 1010}
793 1011
794############################################################################# 1012#############################################################################
795 1013
… …
817 $self->{children}[$y][$x] = $child; 1035 $self->{children}[$y][$x] = $child;
818 1036
819 $child->check_size; 1037 $child->check_size;
820} 1038}
821 1039
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
822# TODO: move to container class maybe? send childs a signal on removal? 1044# TODO: move to container class maybe? send childs a signal on removal?
823sub clear { 1045sub clear {
824 my ($self) = @_; 1046 my ($self) = @_;
825 1047
1048 my @children = $self->children;
826 delete $self->{children}; 1049 delete $self->{children};
1050
1051 for (@children) {
1052 delete $_->{parent};
1053 $_->hide;
1054 }
1055
827 $self->update; 1056 $self->update;
828} 1057}
829 1058
830sub get_wh { 1059sub get_wh {
831 my ($self) = @_; 1060 my ($self) = @_;
… …
837 or next; 1066 or next;
838 1067
839 for my $x (0 .. $#$row) { 1068 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 1069 my $widget = $row->[$x]
841 or next; 1070 or next;
842 my ($w, $h) = $widget->size_request; 1071 my ($w, $h) = @$widget{qw(req_w req_h)};
843 1072
844 $w[$x] = max $w[$x], $w; 1073 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 1074 $h[$y] = max $h[$y], $h;
846 } 1075 }
847 } 1076 }
… …
952 1181
953 ($h, $w) = ($w, $h); 1182 ($h, $w) = ($w, $h);
954 1183
955 my $children = $self->{children}; 1184 my $children = $self->{children};
956 1185
957 my @h = map +($_->size_request)[0], @$children; 1186 my @h = map $_->{req_w}, @$children;
958 1187
959 my $req_h = List::Util::sum @h; 1188 my $req_h = List::Util::sum @h;
960 1189
961 if ($req_h > $h) { 1190 if ($req_h > $h) {
962 # ah well, not enough space 1191 # ah well, not enough space
… …
1010sub size_allocate { 1239sub size_allocate {
1011 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h) = @_;
1012 1241
1013 my $children = $self->{children}; 1242 my $children = $self->{children};
1014 1243
1015 my @h = map +($_->size_request)[1], @$children; 1244 my @h = map $_->{req_h}, @$children;
1016 1245
1017 my $req_h = List::Util::sum @h; 1246 my $req_h = List::Util::sum @h;
1018 1247
1019 if ($req_h > $h) { 1248 if ($req_h > $h) {
1020 # ah well, not enough space 1249 # ah well, not enough space
… …
1054 1283
1055sub new { 1284sub new {
1056 my ($class, %arg) = @_; 1285 my ($class, %arg) = @_;
1057 1286
1058 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1288 fg => [1, 1, 1],
1289 #font => default_font
1060 fontsize => 1, 1290 fontsize => 1,
1061 text => "", 1291 text => "",
1062 align => -1, 1292 align => -1,
1063 valign => -1, 1293 valign => -1,
1064 padding => 2, 1294 padding => 2,
1065 layout => new CFClient::Layout, 1295 layout => new CFClient::Layout,
1296 can_events => 0,
1066 %arg 1297 %arg
1067 ); 1298 );
1068 1299
1069 if (exists $self->{template}) { 1300 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1301 my $layout = new CFClient::Layout;
… …
1076 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1077 1308
1078 $self 1309 $self
1079} 1310}
1080 1311
1081sub escape_text { 1312sub escape {
1082 local $_ = $_[1]; 1313 local $_ = $_[1];
1083 1314
1084 s/&/&amp;/g; 1315 s/&/&amp;/g;
1085 s/>/&gt;/g; 1316 s/>/&gt;/g;
1086 s/</&lt;/g; 1317 s/</&lt;/g;
1087 1318
1088 $_[1] 1319 $_[1]
1089} 1320}
1090 1321
1322sub update {
1323 my ($self) = @_;
1324
1325 delete $self->{texture};
1326 $self->SUPER::update;
1327}
1328
1091sub set_text { 1329sub set_text {
1092 my ($self, $text) = @_; 1330 my ($self, $text) = @_;
1093 1331
1332 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text";
1334
1094 $self->{layout}->set_text ($text); 1335 $self->{layout}->set_text ($text);
1095 1336
1096 delete $self->{texture}; 1337 delete $self->{texture};
1097 $self->update; 1338 $self->update;
1339 $self->check_size;
1098} 1340}
1099 1341
1100sub set_markup { 1342sub set_markup {
1101 my ($self, $markup) = @_; 1343 my ($self, $markup) = @_;
1102 1344
1345 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup";
1347
1103 $self->{layout}->set_markup ($markup); 1348 $self->{layout}->set_markup ($markup);
1104 1349
1105 delete $self->{texture}; 1350 delete $self->{texture};
1106 $self->update; 1351 $self->update;
1352 $self->check_size;
1107} 1353}
1108 1354
1109sub size_request { 1355sub size_request {
1110 my ($self) = @_; 1356 my ($self) = @_;
1111 1357
1112 $self->{layout}->set_width; 1358 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1);
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1361
1115 my ($w, $h) = $self->{layout}->size; 1362 my ($w, $h) = $self->{layout}->size;
1116 1363
1117 if (exists $self->{template}) { 1364 if (exists $self->{template}) {
1365 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1366 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1367
1120 my ($w2, $h2) = $self->{template}->size; 1368 my ($w2, $h2) = $self->{template}->size;
1121 1369
1122 $w = List::Util::max $w, $w2; 1370 $w = List::Util::max $w, $w2;
… …
1137 1385
1138sub set_fontsize { 1386sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1387 my ($self, $fontsize) = @_;
1140 1388
1141 $self->{fontsize} = $fontsize; 1389 $self->{fontsize} = $fontsize;
1390 delete $self->{texture};
1391
1392 $self->update;
1142 $self->check_size; 1393 $self->check_size;
1143} 1394}
1144 1395
1145sub _draw { 1396sub _draw {
1146 my ($self) = @_; 1397 my ($self) = @_;
1147 1398
1148 my $tex = $self->{texture} ||= do { 1399 my $tex = $self->{texture} ||= do {
1400 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $self->{layout}->set_width ($self->{w}); 1401 $self->{layout}->set_width ($self->{w});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1151 new_from_layout CFClient::Texture $self->{layout} 1403 new_from_layout CFClient::Texture $self->{layout}
1152 }; 1404 };
1153 1405
… …
1186 1438
1187sub new { 1439sub new {
1188 my $class = shift; 1440 my $class = shift;
1189 1441
1190 $class->SUPER::new ( 1442 $class->SUPER::new (
1191 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1444 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1445 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1446 active_fg => [0, 0, 0],
1195 can_hover => 1, 1447 can_hover => 1,
1196 can_focus => 1, 1448 can_focus => 1,
1197 valign => 0, 1449 valign => 0,
1450 can_events => 1,
1198 @_ 1451 @_
1199 ) 1452 )
1200} 1453}
1201 1454
1202sub _set_text { 1455sub _set_text {
… …
1230} 1483}
1231 1484
1232sub size_allocate { 1485sub size_allocate {
1233 my ($self, $w, $h) = @_; 1486 my ($self, $w, $h) = @_;
1234 1487
1235 $self->_set_text ($self->{text}); 1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236} 1489}
1237 1490
1238sub set_text { 1491sub set_text {
1239 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1240 1493
… …
1355 my ($self, $ev) = @_; 1608 my ($self, $ev) = @_;
1356 1609
1357 my $sym = $ev->{sym}; 1610 my $sym = $ev->{sym};
1358 1611
1359 if ($sym == 13) { 1612 if ($sym == 13) {
1613 unshift @{$self->{history}},
1614 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1617 $self->emit (activate => $txt);
1361 $self->update; 1618 $self->update;
1619
1620 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text;
1623 }
1624 if (@{$self->{history} || []} > 0) {
1625 $self->{history_pointer}++;
1626 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1627 $self->{history_pointer} = @{$self->{history} || []} - 1;
1628 }
1629 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1630 }
1631
1632 } elsif ($sym == CFClient::SDLK_DOWN) {
1633 $self->{history_pointer}--;
1634 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1635
1636 if ($self->{history_pointer} >= 0) {
1637 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1638 } else {
1639 $self->set_text ($self->{history_saveback});
1640 }
1362 1641
1363 } else { 1642 } else {
1364 $self->SUPER::key_down ($ev); 1643 $self->SUPER::key_down ($ev);
1365 } 1644 }
1366 1645
… …
1380 1659
1381sub new { 1660sub new {
1382 my $class = shift; 1661 my $class = shift;
1383 1662
1384 $class->SUPER::new ( 1663 $class->SUPER::new (
1385 padding => 4, 1664 padding => 4,
1386 fg => [1, 1, 1], 1665 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2], 1666 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1667 active_fg => [0, 0, 1],
1389 can_hover => 1, 1668 can_hover => 1,
1390 align => 0, 1669 align => 0,
1391 valign => 0, 1670 valign => 0,
1671 can_events => 1,
1392 @_ 1672 @_
1393 ) 1673 )
1394} 1674}
1395 1675
1396sub button_up { 1676sub button_up {
… …
1501our %loaded_images; 1781our %loaded_images;
1502 1782
1503sub new { 1783sub new {
1504 my $class = shift; 1784 my $class = shift;
1505 1785
1506 my $self = $class->SUPER::new (@_); 1786 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1787
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1788 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1789
1510 $loaded_images{$self->{image}} ||= 1790 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1791 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1553############################################################################# 1833#############################################################################
1554 1834
1555package CFClient::UI::VGauge; 1835package CFClient::UI::VGauge;
1556 1836
1557our @ISA = CFClient::UI::Base::; 1837our @ISA = CFClient::UI::Base::;
1838
1839use List::Util qw(min max);
1558 1840
1559use CFClient::OpenGL; 1841use CFClient::OpenGL;
1560 1842
1561my %tex = ( 1843my %tex = (
1562 food => [ 1844 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1845 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1846 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1847 ],
1566 grace => [ 1848 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1849 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1850 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1851 ],
1570 hp => [ 1852 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1854 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1855 ],
1574 mana => [ 1856 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1858 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1859 ],
1578); 1860);
1579 1861
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 1862# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 1863sub new {
… …
1600} 1882}
1601 1883
1602sub set_max { 1884sub set_max {
1603 my ($self, $max) = @_; 1885 my ($self, $max) = @_;
1604 1886
1887 return if $self->{max_val} == $max;
1888
1605 $self->{max_val} = $max; 1889 $self->{max_val} = $max;
1890 $self->update;
1606} 1891}
1607 1892
1608sub set_value { 1893sub set_value {
1609 my ($self, $val, $max) = @_; 1894 my ($self, $val, $max) = @_;
1610 1895
1611 $self->set_max ($max) 1896 $self->set_max ($max)
1612 if defined $max; 1897 if defined $max;
1613 1898
1614 $max = $self->{max_val}; 1899 return if $self->{val} == $val;
1900
1615 $self->{val} = $val; 1901 $self->{val} = $val;
1616
1617 $self->update; 1902 $self->update;
1618} 1903}
1619 1904
1620sub _draw { 1905sub _draw {
1621 my ($self) = @_; 1906 my ($self) = @_;
1622 1907
1623 my $tex = $tex{$self->{type}}; 1908 my $tex = $tex{$self->{type}};
1909 my ($t1, $t2, $t3) = @$tex;
1624 1910
1625 my ($w, $h) = ($self->{w}, $self->{h}); 1911 my ($w, $h) = ($self->{w}, $self->{h});
1626 1912
1627 if ($self->{vertical}) { 1913 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 1914 glRotate 90, 0, 0, 1;
… …
1630 1916
1631 ($w, $h) = ($h, $w); 1917 ($w, $h) = ($h, $w);
1632 } 1918 }
1633 1919
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 1920 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 1921
1637 my $t1 = $tex->[0]; 1922 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 1923 my $ycut2 = max 0, min 1, $ycut - 1;
1924
1925 my $h1 = $self->{h} * (1 - $ycut1);
1926 my $h2 = $self->{h} * (1 - $ycut2);
1639 1927
1640 glEnable GL_BLEND; 1928 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 1930 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 1932
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1933 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 1934 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 1935 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1936 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1937 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1938 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 1939 glEnd;
1655 1940
1941 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1942 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 1943 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1944 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1945 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1946 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1947 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 1948 glEnd;
1949
1950 if ($t3) {
1951 glBindTexture GL_TEXTURE_2D, $t3->{name};
1952 glBegin GL_QUADS;
1953 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1954 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1955 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1956 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1957 glEnd;
1958 }
1663 1959
1664 glDisable GL_BLEND; 1960 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 1961 glDisable GL_TEXTURE_2D;
1666} 1962}
1667 1963
… …
1670package CFClient::UI::Gauge; 1966package CFClient::UI::Gauge;
1671 1967
1672our @ISA = CFClient::UI::VBox::; 1968our @ISA = CFClient::UI::VBox::;
1673 1969
1674sub new { 1970sub new {
1675 my ($class, %arg) = shift; 1971 my ($class, %arg) = @_;
1676 1972
1677 my $self = $class->SUPER::new ( 1973 my $self = $class->SUPER::new (
1678 @_, 1974 tooltip => $arg{type},
1975 can_hover => 1,
1976 can_events => 1,
1977 %arg,
1679 ); 1978 );
1680 1979
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1980 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1981 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1982 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 1983
1685 $self 1984 $self
1686} 1985}
1687 1986
1688sub set_fontsize { 1987sub set_fontsize {
… …
1690 1989
1691 $self->{value}->set_fontsize ($fsize); 1990 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 1991 $self->{max} ->set_fontsize ($fsize);
1693} 1992}
1694 1993
1994sub set_max {
1995 my ($self, $max) = @_;
1996
1997 $self->{gauge}->set_max ($max);
1998 $self->{max}->set_text ($max);
1999}
2000
1695sub set_value { 2001sub set_value {
1696 my ($self, $val, $max) = @_; 2002 my ($self, $val, $max) = @_;
1697 2003
1698 $self->set_max ($max) 2004 $self->set_max ($max)
1699 if defined $max; 2005 if defined $max;
1700 2006
1701 $self->{gauge}->set_value ($val, $max); 2007 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 2008 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 2009}
1711 2010
1712############################################################################# 2011#############################################################################
1713 2012
1714package CFClient::UI::Slider; 2013package CFClient::UI::Slider;
… …
1733 # TODO: calculations are off 2032 # TODO: calculations are off
1734 my $self = $class->SUPER::new ( 2033 my $self = $class->SUPER::new (
1735 fg => [1, 1, 1], 2034 fg => [1, 1, 1],
1736 active_fg => [0, 0, 0], 2035 active_fg => [0, 0, 0],
1737 range => [0, 0, 100, 10], 2036 range => [0, 0, 100, 10],
1738 req_w => 20, 2037 req_w => $::WIDTH / 80,
1739 req_h => 20, 2038 req_h => $::WIDTH / 80,
1740 vertical => 0, 2039 vertical => 0,
1741 can_hover => 1, 2040 can_hover => 1,
1742 inner_pad => 5, 2041 inner_pad => 5,
1743 @_ 2042 @_
1744 ); 2043 );
… …
1854 2153
1855sub new { 2154sub new {
1856 my $class = shift; 2155 my $class = shift;
1857 2156
1858 my $self = $class->SUPER::new ( 2157 my $self = $class->SUPER::new (
1859 fontsize => 1, 2158 fontsize => 1,
2159 can_events => 0,
2160 #font => default_font
1860 @_, 2161 @_,
1861 2162
1862 layout => (new CFClient::Layout), 2163 layout => (new CFClient::Layout),
1863 par => [], 2164 par => [],
1864 height => 0, 2165 height => 0,
1865 children => [ 2166 children => [
1866 (new CFClient::UI::Empty expand => 1), 2167 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2168 (new CFClient::UI::Slider vertical => 1),
1868 ], 2169 ],
1869 ); 2170 );
1870 2171
1871 $self->{children}[1]->connect (changed => sub { 2172 $self->{children}[1]->connect (changed => sub { $self->update });
1872 $self->update;
1873 });
1874 2173
1875 $self 2174 $self
1876} 2175}
1877 2176
1878sub set_fontsize { 2177sub set_fontsize {
… …
1886 my ($self, $text) = @_; 2185 my ($self, $text) = @_;
1887 2186
1888 my $layout = $self->{layout}; 2187 my $layout = $self->{layout};
1889 2188
1890 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891 $layout->set_width ($self->{w}); 2190 $layout->set_width ($self->{children}[0]{w});
1892 $layout->set_text ($text); 2191 $layout->set_text ($text);
1893 2192
1894 ($layout->size)[1] 2193 ($layout->size)[1]
1895} 2194}
1896 2195
… …
1904sub size_allocate { 2203sub size_allocate {
1905 my ($self, $w, $h) = @_; 2204 my ($self, $w, $h) = @_;
1906 2205
1907 $self->SUPER::size_allocate ($w, $h); 2206 $self->SUPER::size_allocate ($w, $h);
1908 2207
2208 $self->{layout}->set_font ($self->{font}) if $self->{font};
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2209 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910 $self->{layout}->set_width ($self->{children}[0]{w}); 2210 $self->{layout}->set_width ($self->{children}[0]{w});
1911 2211
1912 $self->reflow; 2212 $self->reflow;
1913} 2213}
… …
1948 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1949 2249
1950 delete $self->{texture}; 2250 delete $self->{texture};
1951 } 2251 }
1952 2252
1953 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1954 glClearColor 0, 0, 0, 1; 2254 glClearColor 0, 0, 0, 0;
1955 glClear GL_COLOR_BUFFER_BIT; 2255 glClear GL_COLOR_BUFFER_BIT;
1956 2256
1957 glEnable GL_BLEND; 2257 glEnable GL_BLEND;
1958 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1959 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
… …
1966 2266
1967 my $y = 0; 2267 my $y = 0;
1968 2268
1969 my $layout = $self->{layout}; 2269 my $layout = $self->{layout};
1970 2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272
1971 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2274 my $h = $par->[0];
1973 2275
1974 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
1975 $layout->set_text ($par->[2]); 2277 $layout->set_text ($par->[2]);
… …
1989} 2291}
1990 2292
1991sub _draw { 2293sub _draw {
1992 my ($self) = @_; 2294 my ($self) = @_;
1993 2295
1994 if ($self->{texture}) { 2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1995 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1;
1997 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1998 glDisable GL_TEXTURE_2D; 2302 glDisable GL_TEXTURE_2D;
1999 } 2303 glDisable GL_BLEND;
2000 2304
2001 $self->{children}[1]->draw; 2305 $self->{children}[1]->draw;
2002 2306
2003} 2307}
2004 2308
… …
2052 2356
2053sub new { 2357sub new {
2054 my $class = shift; 2358 my $class = shift;
2055 2359
2056 my $self = $class->SUPER::new ( 2360 my $self = $class->SUPER::new (
2057 state => 0, 2361 state => 0,
2058 connect_activate => \&toggle_flopper, 2362 connect_activate => \&toggle_flopper,
2059 @_ 2363 @_
2060 ); 2364 );
2061 2365
2062 if ($self->{state}) { 2366 if ($self->{state}) {
… …
2083 $self->emit (changed => $self->{state}); 2387 $self->emit (changed => $self->{state});
2084} 2388}
2085 2389
2086############################################################################# 2390#############################################################################
2087 2391
2392package CFClient::UI::Tooltip;
2393
2394our @ISA = CFClient::UI::Bin::;
2395
2396use CFClient::OpenGL;
2397
2398sub new {
2399 my $class = shift;
2400
2401 $class->SUPER::new (
2402 @_,
2403 can_events => 0,
2404 )
2405}
2406
2407sub set_markup {
2408 my ($self, $text) = @_;
2409
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2411 $self->{label}->set_markup ($text);
2412 $self->add ($self->{label});
2413}
2414
2415sub size_request {
2416 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421
2422 ($w + 4, $h + 4)
2423}
2424
2425sub size_allocate {
2426 my ($self, $w, $h) = @_;
2427
2428 $self->SUPER::size_allocate ($w - 4, $h - 4);
2429}
2430
2431sub _draw {
2432 my ($self) = @_;
2433
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375;
2436
2437 my ($w, $h) = @$self{qw(w h)};
2438
2439 glColor 1, 0.8, 0.4;
2440 glBegin GL_QUADS;
2441 glVertex 0 , 0;
2442 glVertex 0 , $h;
2443 glVertex $w, $h;
2444 glVertex $w, 0;
2445 glEnd;
2446
2447 glColor 0, 0, 0;
2448 glBegin GL_LINE_LOOP;
2449 glVertex 0 , 0;
2450 glVertex 0 , $h;
2451 glVertex $w, $h;
2452 glVertex $w, 0;
2453 glEnd;
2454
2455 glPopMatrix;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw;
2459}
2460
2461#############################################################################
2462
2463package CFClient::UI::Face;
2464
2465our @ISA = CFClient::UI::Base::;
2466
2467use CFClient::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 aspect => 1,
2474 @_,
2475 )
2476}
2477
2478sub size_request {
2479 (32, 8)
2480}
2481
2482sub _draw {
2483 my ($self) = @_;
2484
2485 return unless $::CONN;#d# manage and cache textures differently
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2487
2488 # TODO animation
2489 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 }
2499}
2500
2501#############################################################################
2502
2503package CFClient::UI::InventoryItem;
2504
2505our @ISA = CFClient::UI::HBox::;
2506
2507sub new {
2508 my $class = shift;
2509
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new (
2520 can_hover => 1,
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_,
2575 );
2576
2577 $self
2578}
2579
2580sub set_items {
2581 my ($self, $items) = @_;
2582
2583 $self->{scrolled}->clear;
2584 return unless $items;
2585
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2587
2588 $self->{real_items} = \@items;
2589
2590 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2596 }
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604}
2605
2606#############################################################################
2607
2608package CFClient::UI::Menu;
2609
2610our @ISA = CFClient::UI::FancyFrame::;
2611
2612use CFClient::OpenGL;
2613
2614sub new {
2615 my $class = shift;
2616
2617 my $self = $class->SUPER::new (
2618 items => [],
2619 z => 100,
2620 @_,
2621 );
2622
2623 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2624
2625 for my $item (@{ $self->{items} }) {
2626 my ($widget, $cb) = @$item;
2627
2628 # handle various types of items, only text for now
2629 if (!ref $widget) {
2630 $widget = new CFClient::UI::Label
2631 can_hover => 1,
2632 can_events => 1,
2633 text => $widget;
2634 }
2635
2636 $self->{item}{$widget} = $item;
2637
2638 $self->{vbox}->add ($widget);
2639 }
2640
2641 $self
2642}
2643
2644# popup given the event (must be a mouse button down event currently)
2645sub popup {
2646 my ($self, $ev) = @_;
2647
2648 $self->emit ("popdown");
2649
2650 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self;
2652 $self->{button} = $ev->{button};
2653
2654 $self->show;
2655 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2656}
2657
2658sub mouse_motion {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 # TODO: should use vbox->find_widget or so
2662 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2663 $self->{hover} = $self->{item}{$HOVER};
2664}
2665
2666sub button_up {
2667 my ($self, $ev, $x, $y) = @_;
2668
2669 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB;
2671 $self->hide;
2672
2673 $self->emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover};
2675 }
2676}
2677
2678#############################################################################
2679
2088package CFClient::UI::Root; 2680package CFClient::UI::Root;
2089 2681
2090our @ISA = CFClient::UI::Container::; 2682our @ISA = CFClient::UI::Container::;
2091 2683
2092use CFClient::OpenGL; 2684use CFClient::OpenGL;
2093 2685
2094sub check_size { 2686sub check_size {
2095 my ($self) = @_; 2687 my ($self) = @_;
2096 2688
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 2689 $self->configure (0, 0, $self->{w}, $self->{h});
2098} 2690}
2099 2691
2100sub size_request { 2692sub size_request {
2101 ($::WIDTH, $::HEIGHT) 2693 my ($self) = @_;
2694
2695 ($self->{w}, $self->{h})
2696}
2697
2698sub size_allocate {
2699 my ($self, $w, $h) = @_;
2700
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2102} 2719}
2103 2720
2104sub configure { 2721sub configure {
2105 my ($self, $x, $y, $w, $h) = @_; 2722 my ($self, $x, $y, $w, $h) = @_;
2106 2723
2107 $self->SUPER::configure ($x, $y, $w, $h); 2724 $self->SUPER::configure ($x, $y, $w, $h);
2108 2725
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request) 2726 for my $child ($self->children) {
2110 for @{$self->{children}}; 2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2731 $child->configure ($X, $Y, $W, $H);
2732 }
2111} 2733}
2112 2734
2113sub _topleft { 2735sub _topleft {
2114 my ($self, $x, $y) = @_; 2736 my ($self, $x, $y) = @_;
2115 2737
… …
2162############################################################################# 2784#############################################################################
2163 2785
2164package CFClient::UI; 2786package CFClient::UI;
2165 2787
2166$ROOT = new CFClient::UI::Root; 2788$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip;
2167 2790
21681 27911
2169 2792

Diff Legend

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