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.149 by root, Sat Apr 22 23:11:32 2006 UTC vs.
Revision 1.188 by root, Mon May 8 21:16:09 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 return unless $self->{parent}; 408 $self->{parent}
409 or return 1;
300 410
301 my ($w, $h) = $self->size_request; 411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
302 414
303 if ($w != $self->{req_w} || $h != $self->{req_h}) { 415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
304 $self->{req_w} = $w; 416 $self->{req_w} = $w;
305 $self->{req_h} = $h; 417 $self->{req_h} = $h;
306 418
307 $self->{parent}->check_size; 419 $self->{parent}->check_size
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
308 } 428 }
309} 429}
310 430
311sub update { 431sub update {
312 my ($self) = @_; 432 my ($self) = @_;
… …
322} 442}
323 443
324sub emit { 444sub emit {
325 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
326 446
327 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
328 $cb->($self, @args);
329 }
330} 448}
331 449
332sub DESTROY { 450sub DESTROY {
333 my ($self) = @_; 451 my ($self) = @_;
334 452
… …
379 497
380package CFClient::UI::Empty; 498package CFClient::UI::Empty;
381 499
382our @ISA = CFClient::UI::Base::; 500our @ISA = CFClient::UI::Base::;
383 501
502sub new {
503 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg);
505}
506
384sub size_request { 507sub size_request {
385 (0, 0) 508 (0, 0)
386} 509}
387 510
388sub draw { } 511sub draw { }
… …
396sub new { 519sub new {
397 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
398 521
399 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
400 523
401 my $self = $class->SUPER::new (children => [], %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
402 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
403 530
404 $self 531 $self
405} 532}
406 533
407sub add { 534sub add {
408 my ($self, $child) = @_; 535 my ($self, @widgets) = @_;
409 536
410 $child->set_parent ($self); 537 $_->set_parent ($self)
538 for @widgets;
411 539
412 use sort 'stable'; 540 use sort 'stable';
413 541
414 $self->{children} = [ 542 $self->{children} = [
415 sort { $a->{z} <=> $b->{z} } 543 sort { $a->{z} <=> $b->{z} }
416 @{$self->{children}}, $child 544 @{$self->{children}}, @widgets
417 ]; 545 ];
418 546
419 $child->check_size; 547 $_->check_size
548 for @widgets;
549
550 $self->update;
551}
552
553sub children {
554 @{ $_[0]{children} }
420} 555}
421 556
422sub remove { 557sub remove {
423 my ($self, $child) = @_; 558 my ($self, $child) = @_;
424 559
425 delete $child->{parent}; 560 delete $child->{parent};
561 $child->hide;
426 562
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 564
429 $self->check_size; 565 $self->check_size;
566 $self->update;
567}
568
569sub clear {
570 my ($self) = @_;
571
572 my $children = delete $self->{children};
573 $self->{children} = [];
574
575 for (@$children) {
576 delete $_->{parent};
577 $_->hide;
578 }
579
580 $self->check_size;
581 $self->update;
430} 582}
431 583
432sub find_widget { 584sub find_widget {
433 my ($self, $x, $y) = @_; 585 my ($self, $x, $y) = @_;
434 586
… …
509} 661}
510 662
511sub update { 663sub update {
512 my ($self) = @_; 664 my ($self) = @_;
513 665
514 # we want to do this delayed... 666 $ROOT->on_refresh ($self => sub { $self->render_child });
515 $self->render_chld;
516 $self->SUPER::update; 667 $self->SUPER::update;
517}
518
519sub render_chld {
520 my ($self) = @_;
521
522 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
523 glClearColor 0, 0, 0, 1;
524 glClear GL_COLOR_BUFFER_BIT;
525 $self->child->draw;
526 };
527} 668}
528 669
529sub size_allocate { 670sub size_allocate {
530 my ($self, $w, $h) = @_; 671 my ($self, $w, $h) = @_;
531 672
532 $self->child->configure (0, 0, $w, $h); 673 $self->SUPER::size_allocate ($w, $h);
674 $self->update;
675}
533 676
677sub _render {
678 $_[0]{children}[0]->draw;
679}
680
681sub render_child {
682 my ($self) = @_;
683
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT;
687
534 $self->render_chld; 688 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 };
535} 697}
536 698
537sub _draw { 699sub _draw {
538 my ($self) = @_; 700 my ($self) = @_;
539 701
… …
541 703
542 my $tex = $self->{texture} 704 my $tex = $self->{texture}
543 or return; 705 or return;
544 706
545 glEnable GL_BLEND; 707 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1;
549 712
550 $tex->draw_quad (0, 0, $w, $h); 713 $tex->draw_quad (0, 0, $w, $h);
551 714
552 glDisable GL_BLEND; 715 glDisable GL_BLEND;
553 glDisable GL_TEXTURE_2D; 716 glDisable GL_TEXTURE_2D;
… …
557 720
558package CFClient::UI::ViewPort; 721package CFClient::UI::ViewPort;
559 722
560our @ISA = CFClient::UI::Window::; 723our @ISA = CFClient::UI::Window::;
561 724
562sub new { die }
563
564sub size_request { 725sub size_request {
565 my ($self) = @_; 726 my ($self) = @_;
566 727
567 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 728 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
568 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
569 730
570 @$self{qw(child_w child_h)} 731 @$self{qw(child_w child_h)}
571} 732}
572 733
573sub _draw { 734sub size_allocate {
574 my ($self) = @_; 735 my ($self, $w, $h) = @_;
575 736
576 $self->{children}[1]->draw; 737 $self->update;
577} 738}
578 739
740sub set_offset {
741 my ($self, $x, $y) = @_;
742
743 $self->{view_x} = int $x;
744 $self->{view_y} = int $y;
745
746 $self->update;
747}
748
749# hmm, this does not work for topleft of $self... but we should not aks for that
750sub _topleft {
751 my ($self, $x, $y) = @_;
752
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
754}
755
756sub find_widget {
757 my ($self, $x, $y) = @_;
758
759 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
760 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
761 ) {
762 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
763 } else {
764 $self->CFClient::UI::Base::find_widget ($x, $y)
765 }
766}
767
768sub _render {
769 my ($self) = @_;
770
771 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
772
773 $self->SUPER::_render;
774}
775
776#############################################################################
777
778package CFClient::UI::ScrolledWindow;
779
780our @ISA = CFClient::UI::HBox::;
781
782sub new {
783 my $class = shift;
784
785 my $self;
786
787 my $slider = new CFClient::UI::Slider
788 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
792 },
793 ;
794
795 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort),
797 slider => $slider,
798 @_,
799 );
800
801 $self->{vp}->add ($self->{scrolled});
802 $self->add ($self->{vp});
803 $self->add ($self->{slider});
804
805 $self
806}
807
808#TODO# update range on size_allocate depeneing on child
809# update viewport offset on scroll
579 810
580############################################################################# 811#############################################################################
581 812
582package CFClient::UI::Frame; 813package CFClient::UI::Frame;
583 814
… …
594 border => 0.8, 825 border => 0.8,
595 @_ 826 @_
596 ); 827 );
597 828
598 $self 829 $self
599}
600
601sub set_size {
602 my ($self, $w, $h) = @_;
603 $self->{req_w} = $w;
604 $self->{req_h} = $h;
605 $self->check_size;
606}
607
608sub size_request {
609 my ($self) = @_;
610 ($self->{req_w}, $self->{req_h})
611}
612
613sub size_allocate {
614 my ($self, $w, $h) = @_;
615 $self->{w} = $w;
616 $self->{h} = $h;
617 $self->child->configure (0, 0, $w, $h);
618} 830}
619 831
620sub _draw { 832sub _draw {
621 my ($self) = @_; 833 my ($self) = @_;
622 834
… …
657 my $class = shift; 869 my $class = shift;
658 870
659 # TODO: user_x, user_y, overwrite moveto? 871 # TODO: user_x, user_y, overwrite moveto?
660 872
661 my $self = $class->SUPER::new ( 873 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 874 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 875 border_bg => [1, 1, 1, 1],
664 border => 0.8, 876 border => 0.6,
877 can_events => 1,
665 @_ 878 @_
666 ); 879 );
667 880
668 $self->{title} &&= new CFClient::UI::Label 881 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 882 align => 0,
670 valign => 1, 883 valign => 1,
671 text => $self->{title}, 884 text => $self->{title},
672 fontsize => 1; 885 fontsize => $self->{border};
673 886
674 $self 887 $self
675} 888}
676 889
677sub border { 890sub border {
678 int $_[0]{border} * $::FONTSIZE 891 int $_[0]{border} * $::FONTSIZE
679} 892}
680 893
681sub size_request { 894sub size_request {
682 my ($self) = @_; 895 my ($self) = @_;
683
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685 896
686 my ($w, $h) = $self->SUPER::size_request; 897 my ($w, $h) = $self->SUPER::size_request;
687 898
688 ( 899 (
689 $w + $self->border * 2, 900 $w + $self->border * 2,
… …
704} 915}
705 916
706sub button_down { 917sub button_down {
707 my ($self, $ev, $x, $y) = @_; 918 my ($self, $ev, $x, $y) = @_;
708 919
920 my ($w, $h) = @$self{qw(w h)};
709 my $border = $self->border; 921 my $border = $self->border;
710 922
711 if ($x < $self->{w} && $x >= $self->{w} - $border 923 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
712 && $y < $self->{h} && $y >= $self->{h} - $border) { 924 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
713 925
926 if ($lr & $td) {
927 my ($wx, $wy) = ($self->{x}, $self->{y});
714 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 928 my ($ox, $oy) = ($ev->{x}, $ev->{y});
715 my ($bw, $bh) = ($self->{w}, $self->{h}); 929 my ($bw, $bh) = ($self->{w}, $self->{h});
716 930
931 my $mx = $x < $border;
932 my $my = $y < $border;
933
717 $self->{motion} = sub { 934 $self->{motion} = sub {
718 my ($ev, $x, $y) = @_; 935 my ($ev, $x, $y) = @_;
719 936
720 ($x, $y) = ($ev->{x}, $ev->{y}); 937 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy;
721 939
722 $self->{user_w} = $bw + $x - $ox; 940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
723 $self->{user_h} = $bh + $y - $oy; 941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
724 $self->check_size; 943 $self->check_size;
725 }; 944 };
726 945
727 } elsif ($x >= 0 && $x < $self->{w} 946 } elsif ($lr ^ $td) {
728 && $y >= 0 && $y < $border) {
729
730 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 947 my ($ox, $oy) = ($ev->{x}, $ev->{y});
731 my ($bx, $by) = ($self->{x}, $self->{y}); 948 my ($bx, $by) = ($self->{x}, $self->{y});
732 949
733 $self->{motion} = sub { 950 $self->{motion} = sub {
734 my ($ev, $x, $y) = @_; 951 my ($ev, $x, $y) = @_;
… …
770 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad (0, 0, $w, $border);
771 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad (0, $border, $border, $ch);
772 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
773 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad (0, $h - $border, $w, $border);
774 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
775 my $bg = $tex[0]; 993 my $bg = $tex[0];
776 994
777 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
778 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
779 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
780 998
781 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
782 1000
783 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
784 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
785 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
786 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad ($border, $border, $cw, $ch);
787 1005
788 glDisable GL_TEXTURE_2D; 1006 glDisable GL_TEXTURE_2D;
789 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
1008 }
790 1009
791 $self->{title}->draw if $self->{title}; 1010 $self->{title}->draw if $self->{title};
1011
792 $self->child->draw; 1012 $self->child->draw;
793} 1013}
794 1014
795############################################################################# 1015#############################################################################
796 1016
… …
818 $self->{children}[$y][$x] = $child; 1038 $self->{children}[$y][$x] = $child;
819 1039
820 $child->check_size; 1040 $child->check_size;
821} 1041}
822 1042
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
823# TODO: move to container class maybe? send childs a signal on removal? 1047# TODO: move to container class maybe? send childs a signal on removal?
824sub clear { 1048sub clear {
825 my ($self) = @_; 1049 my ($self) = @_;
826 1050
1051 my @children = $self->children;
827 delete $self->{children}; 1052 delete $self->{children};
1053
1054 for (@children) {
1055 delete $_->{parent};
1056 $_->hide;
1057 }
1058
828 $self->update; 1059 $self->update;
829} 1060}
830 1061
831sub get_wh { 1062sub get_wh {
832 my ($self) = @_; 1063 my ($self) = @_;
… …
1055 1286
1056sub new { 1287sub new {
1057 my ($class, %arg) = @_; 1288 my ($class, %arg) = @_;
1058 1289
1059 my $self = $class->SUPER::new ( 1290 my $self = $class->SUPER::new (
1060 fg => [1, 1, 1], 1291 fg => [1, 1, 1],
1292 #font => default_font
1061 fontsize => 1, 1293 fontsize => 1,
1062 text => "", 1294 text => "",
1063 align => -1, 1295 align => -1,
1064 valign => -1, 1296 valign => -1,
1065 padding => 2, 1297 padding => 2,
1066 layout => new CFClient::Layout, 1298 layout => new CFClient::Layout,
1299 can_events => 0,
1067 %arg 1300 %arg
1068 ); 1301 );
1069 1302
1070 if (exists $self->{template}) { 1303 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1304 my $layout = new CFClient::Layout;
… …
1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1078 1311
1079 $self 1312 $self
1080} 1313}
1081 1314
1082sub escape_text { 1315sub escape {
1083 local $_ = $_[1]; 1316 local $_ = $_[1];
1084 1317
1085 s/&/&amp;/g; 1318 s/&/&amp;/g;
1086 s/>/&gt;/g; 1319 s/>/&gt;/g;
1087 s/</&lt;/g; 1320 s/</&lt;/g;
1088 1321
1089 $_[1] 1322 $_[1]
1090} 1323}
1091 1324
1325sub update {
1326 my ($self) = @_;
1327
1328 delete $self->{texture};
1329 $self->SUPER::update;
1330}
1331
1092sub set_text { 1332sub set_text {
1093 my ($self, $text) = @_; 1333 my ($self, $text) = @_;
1094 1334
1335 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text";
1337
1095 $self->{layout}->set_text ($text); 1338 $self->{layout}->set_text ($text);
1096 1339
1097 delete $self->{texture}; 1340 delete $self->{texture};
1341 $self->update;
1098 $self->check_size; 1342 $self->check_size;
1099 $self->update;
1100} 1343}
1101 1344
1102sub set_markup { 1345sub set_markup {
1103 my ($self, $markup) = @_; 1346 my ($self, $markup) = @_;
1104 1347
1348 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup";
1350
1105 $self->{layout}->set_markup ($markup); 1351 $self->{layout}->set_markup ($markup);
1106 1352
1107 delete $self->{texture}; 1353 delete $self->{texture};
1354 $self->update;
1108 $self->check_size; 1355 $self->check_size;
1109 $self->update;
1110} 1356}
1111 1357
1112sub size_request { 1358sub size_request {
1113 my ($self) = @_; 1359 my ($self) = @_;
1114 1360
1115 $self->{layout}->set_width; 1361 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $self->{layout}->set_width ($self->{max_w} || -1);
1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1117 1364
1118 my ($w, $h) = $self->{layout}->size; 1365 my ($w, $h) = $self->{layout}->size;
1119 1366
1120 if (exists $self->{template}) { 1367 if (exists $self->{template}) {
1368 $self->{template}->set_font ($self->{font}) if $self->{font};
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1369 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122 1370
1123 my ($w2, $h2) = $self->{template}->size; 1371 my ($w2, $h2) = $self->{template}->size;
1124 1372
1125 $w = List::Util::max $w, $w2; 1373 $w = List::Util::max $w, $w2;
… …
1140 1388
1141sub set_fontsize { 1389sub set_fontsize {
1142 my ($self, $fontsize) = @_; 1390 my ($self, $fontsize) = @_;
1143 1391
1144 $self->{fontsize} = $fontsize; 1392 $self->{fontsize} = $fontsize;
1393 delete $self->{texture};
1394
1395 $self->update;
1145 $self->check_size; 1396 $self->check_size;
1146} 1397}
1147 1398
1148sub _draw { 1399sub _draw {
1149 my ($self) = @_; 1400 my ($self) = @_;
1150 1401
1151 my $tex = $self->{texture} ||= do { 1402 my $tex = $self->{texture} ||= do {
1403 $self->{layout}->set_font ($self->{font}) if $self->{font};
1152 $self->{layout}->set_width ($self->{w}); 1404 $self->{layout}->set_width ($self->{w});
1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1154 new_from_layout CFClient::Texture $self->{layout} 1406 new_from_layout CFClient::Texture $self->{layout}
1155 }; 1407 };
1156 1408
… …
1189 1441
1190sub new { 1442sub new {
1191 my $class = shift; 1443 my $class = shift;
1192 1444
1193 $class->SUPER::new ( 1445 $class->SUPER::new (
1194 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1195 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1196 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1198 can_hover => 1, 1450 can_hover => 1,
1199 can_focus => 1, 1451 can_focus => 1,
1200 valign => 0, 1452 valign => 0,
1453 can_events => 1,
1201 @_ 1454 @_
1202 ) 1455 )
1203} 1456}
1204 1457
1205sub _set_text { 1458sub _set_text {
… …
1358 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1359 1612
1360 my $sym = $ev->{sym}; 1613 my $sym = $ev->{sym};
1361 1614
1362 if ($sym == 13) { 1615 if ($sym == 13) {
1616 unshift @{$self->{history}},
1617 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = '';
1363 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1364 $self->update; 1621 $self->update;
1622
1623 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text;
1626 }
1627 if (@{$self->{history} || []} > 0) {
1628 $self->{history_pointer}++;
1629 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1630 $self->{history_pointer} = @{$self->{history} || []} - 1;
1631 }
1632 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1633 }
1634
1635 } elsif ($sym == CFClient::SDLK_DOWN) {
1636 $self->{history_pointer}--;
1637 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1638
1639 if ($self->{history_pointer} >= 0) {
1640 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1641 } else {
1642 $self->set_text ($self->{history_saveback});
1643 }
1365 1644
1366 } else { 1645 } else {
1367 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1368 } 1647 }
1369 1648
… …
1383 1662
1384sub new { 1663sub new {
1385 my $class = shift; 1664 my $class = shift;
1386 1665
1387 $class->SUPER::new ( 1666 $class->SUPER::new (
1388 padding => 4, 1667 padding => 4,
1389 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1390 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1670 active_fg => [0, 0, 1],
1392 can_hover => 1, 1671 can_hover => 1,
1393 align => 0, 1672 align => 0,
1394 valign => 0, 1673 valign => 0,
1674 can_events => 1,
1395 @_ 1675 @_
1396 ) 1676 )
1397} 1677}
1398 1678
1399sub button_up { 1679sub button_up {
… …
1504our %loaded_images; 1784our %loaded_images;
1505 1785
1506sub new { 1786sub new {
1507 my $class = shift; 1787 my $class = shift;
1508 1788
1509 my $self = $class->SUPER::new (@_); 1789 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1790
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1791 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1792
1513 $loaded_images{$self->{image}} ||= 1793 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1794 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1556############################################################################# 1836#############################################################################
1557 1837
1558package CFClient::UI::VGauge; 1838package CFClient::UI::VGauge;
1559 1839
1560our @ISA = CFClient::UI::Base::; 1840our @ISA = CFClient::UI::Base::;
1841
1842use List::Util qw(min max);
1561 1843
1562use CFClient::OpenGL; 1844use CFClient::OpenGL;
1563 1845
1564my %tex = ( 1846my %tex = (
1565 food => [ 1847 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1849 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ], 1850 ],
1569 grace => [ 1851 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1852 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1853 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1572 ], 1854 ],
1573 hp => [ 1855 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1856 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1857 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ], 1858 ],
1577 mana => [ 1859 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1860 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1861 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1580 ], 1862 ],
1581); 1863);
1582 1864
1583# eg. VGauge->new (gauge => 'food'), default gauge: food 1865# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new { 1866sub new {
… …
1603} 1885}
1604 1886
1605sub set_max { 1887sub set_max {
1606 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1607 1889
1890 return if $self->{max_val} == $max;
1891
1608 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1609} 1894}
1610 1895
1611sub set_value { 1896sub set_value {
1612 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1613 1898
1614 $self->set_max ($max) 1899 $self->set_max ($max)
1615 if defined $max; 1900 if defined $max;
1616 1901
1617 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1618 $self->{val} = $val; 1904 $self->{val} = $val;
1619
1620 $self->update; 1905 $self->update;
1621} 1906}
1622 1907
1623sub _draw { 1908sub _draw {
1624 my ($self) = @_; 1909 my ($self) = @_;
1625 1910
1626 my $tex = $tex{$self->{type}}; 1911 my $tex = $tex{$self->{type}};
1912 my ($t1, $t2, $t3) = @$tex;
1627 1913
1628 my ($w, $h) = ($self->{w}, $self->{h}); 1914 my ($w, $h) = ($self->{w}, $self->{h});
1629 1915
1630 if ($self->{vertical}) { 1916 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1; 1917 glRotate 90, 0, 0, 1;
… …
1633 1919
1634 ($w, $h) = ($h, $w); 1920 ($w, $h) = ($h, $w);
1635 } 1921 }
1636 1922
1637 my $ycut = $self->{val} / ($self->{max_val} || 1); 1923 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639 1924
1640 my $t1 = $tex->[0]; 1925 my $ycut1 = max 0, min 1, $ycut;
1641 my $t2 = $tex->[1]; 1926 my $ycut2 = max 0, min 1, $ycut - 1;
1927
1928 my $h1 = $self->{h} * (1 - $ycut1);
1929 my $h2 = $self->{h} * (1 - $ycut2);
1642 1930
1643 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D; 1933 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 1935
1648 my $h1 = $self->{h} - $ycut * $self->{h};
1649 my $h2 = $ycut * $self->{h};
1650
1651 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1936 glBindTexture GL_TEXTURE_2D, $t1->{name};
1652 glBegin GL_QUADS; 1937 glBegin GL_QUADS;
1653 glTexCoord 0 , 0; glVertex 0 , 0; 1938 glTexCoord 0 , 0; glVertex 0 , 0;
1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1939 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1940 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1656 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1941 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1657 glEnd; 1942 glEnd;
1658 1943
1944 my $ycut1 = List::Util::min 1, $ycut;
1659 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1945 glBindTexture GL_TEXTURE_2D, $t2->{name};
1660 glBegin GL_QUADS; 1946 glBegin GL_QUADS;
1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1947 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1948 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1949 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1950 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1665 glEnd; 1951 glEnd;
1952
1953 if ($t3) {
1954 glBindTexture GL_TEXTURE_2D, $t3->{name};
1955 glBegin GL_QUADS;
1956 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1957 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1958 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1959 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1960 glEnd;
1961 }
1666 1962
1667 glDisable GL_BLEND; 1963 glDisable GL_BLEND;
1668 glDisable GL_TEXTURE_2D; 1964 glDisable GL_TEXTURE_2D;
1669} 1965}
1670 1966
… …
1673package CFClient::UI::Gauge; 1969package CFClient::UI::Gauge;
1674 1970
1675our @ISA = CFClient::UI::VBox::; 1971our @ISA = CFClient::UI::VBox::;
1676 1972
1677sub new { 1973sub new {
1678 my ($class, %arg) = shift; 1974 my ($class, %arg) = @_;
1679 1975
1680 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1681 @_, 1977 tooltip => $arg{type},
1978 can_hover => 1,
1979 can_events => 1,
1980 %arg,
1682 ); 1981 );
1683 1982
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1983 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1685 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1984 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1686 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1985 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1986
1688 $self 1987 $self
1689} 1988}
1690 1989
1691sub set_fontsize { 1990sub set_fontsize {
… …
1693 1992
1694 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1695 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1696} 1995}
1697 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1698sub set_value { 2004sub set_value {
1699 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1700 2006
1701 $self->set_max ($max) 2007 $self->set_max ($max)
1702 if defined $max; 2008 if defined $max;
1703 2009
1704 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1705 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1706}
1707
1708sub set_max {
1709 my ($self, $max) = @_;
1710
1711 $self->{gauge}->set_max ($max);
1712 $self->{max}->set_text ($max);
1713} 2012}
1714 2013
1715############################################################################# 2014#############################################################################
1716 2015
1717package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1736 # TODO: calculations are off 2035 # TODO: calculations are off
1737 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1738 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1739 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1740 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1741 req_w => 20, 2040 req_w => $::WIDTH / 80,
1742 req_h => 20, 2041 req_h => $::WIDTH / 80,
1743 vertical => 0, 2042 vertical => 0,
1744 can_hover => 1, 2043 can_hover => 1,
1745 inner_pad => 5, 2044 inner_pad => 5,
1746 @_ 2045 @_
1747 ); 2046 );
… …
1857 2156
1858sub new { 2157sub new {
1859 my $class = shift; 2158 my $class = shift;
1860 2159
1861 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1862 fontsize => 1, 2161 fontsize => 1,
2162 can_events => 0,
2163 #font => default_font
1863 @_, 2164 @_,
1864 2165
1865 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1866 par => [], 2167 par => [],
1867 height => 0, 2168 height => 0,
1868 children => [ 2169 children => [
1869 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1870 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1871 ], 2172 ],
1872 ); 2173 );
1873 2174
1874 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1875 $self->update;
1876 });
1877 2176
1878 $self 2177 $self
1879} 2178}
1880 2179
1881sub set_fontsize { 2180sub set_fontsize {
… …
1889 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1890 2189
1891 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1892 2191
1893 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1894 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1895 $layout->set_text ($text); 2194 $layout->set_text ($text);
1896 2195
1897 ($layout->size)[1] 2196 ($layout->size)[1]
1898} 2197}
1899 2198
… …
1907sub size_allocate { 2206sub size_allocate {
1908 my ($self, $w, $h) = @_; 2207 my ($self, $w, $h) = @_;
1909 2208
1910 $self->SUPER::size_allocate ($w, $h); 2209 $self->SUPER::size_allocate ($w, $h);
1911 2210
2211 $self->{layout}->set_font ($self->{font}) if $self->{font};
1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2212 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $self->{layout}->set_width ($self->{children}[0]{w}); 2213 $self->{layout}->set_width ($self->{children}[0]{w});
1914 2214
1915 $self->reflow; 2215 $self->reflow;
1916} 2216}
… …
1951 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1952 2252
1953 delete $self->{texture}; 2253 delete $self->{texture};
1954 } 2254 }
1955 2255
1956 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1957 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
1958 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
1959 2259
1960 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
1969 2269
1970 my $y = 0; 2270 my $y = 0;
1971 2271
1972 my $layout = $self->{layout}; 2272 my $layout = $self->{layout};
1973 2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275
1974 for my $par (@{$self->{par}}) { 2276 for my $par (@{$self->{par}}) {
1975 my $h = $par->[0]; 2277 my $h = $par->[0];
1976 2278
1977 if ($y0 < $y + $h && $y < $y1) { 2279 if ($y0 < $y + $h && $y < $y1) {
1978 $layout->set_text ($par->[2]); 2280 $layout->set_text ($par->[2]);
… …
1992} 2294}
1993 2295
1994sub _draw { 2296sub _draw {
1995 my ($self) = @_; 2297 my ($self) = @_;
1996 2298
1997 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1;
2000 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2001 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2002 } 2306 glDisable GL_BLEND;
2003 2307
2004 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2005 2309
2006} 2310}
2007 2311
… …
2055 2359
2056sub new { 2360sub new {
2057 my $class = shift; 2361 my $class = shift;
2058 2362
2059 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
2060 state => 0, 2364 state => 0,
2061 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
2062 @_ 2366 @_
2063 ); 2367 );
2064 2368
2065 if ($self->{state}) { 2369 if ($self->{state}) {
… …
2086 $self->emit (changed => $self->{state}); 2390 $self->emit (changed => $self->{state});
2087} 2391}
2088 2392
2089############################################################################# 2393#############################################################################
2090 2394
2395package CFClient::UI::Tooltip;
2396
2397our @ISA = CFClient::UI::Bin::;
2398
2399use CFClient::OpenGL;
2400
2401sub new {
2402 my $class = shift;
2403
2404 $class->SUPER::new (
2405 @_,
2406 can_events => 0,
2407 )
2408}
2409
2410sub set_markup {
2411 my ($self, $text) = @_;
2412
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2414 $self->{label}->set_markup ($text);
2415 $self->add ($self->{label});
2416}
2417
2418sub size_request {
2419 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424
2425 ($w + 4, $h + 4)
2426}
2427
2428sub size_allocate {
2429 my ($self, $w, $h) = @_;
2430
2431 $self->SUPER::size_allocate ($w - 4, $h - 4);
2432}
2433
2434sub _draw {
2435 my ($self) = @_;
2436
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375;
2439
2440 my ($w, $h) = @$self{qw(w h)};
2441
2442 glColor 1, 0.8, 0.4;
2443 glBegin GL_QUADS;
2444 glVertex 0 , 0;
2445 glVertex 0 , $h;
2446 glVertex $w, $h;
2447 glVertex $w, 0;
2448 glEnd;
2449
2450 glColor 0, 0, 0;
2451 glBegin GL_LINE_LOOP;
2452 glVertex 0 , 0;
2453 glVertex 0 , $h;
2454 glVertex $w, $h;
2455 glVertex $w, 0;
2456 glEnd;
2457
2458 glPopMatrix;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package CFClient::UI::Face;
2467
2468our @ISA = CFClient::UI::Base::;
2469
2470use CFClient::OpenGL;
2471
2472sub new {
2473 my $class = shift;
2474
2475 $class->SUPER::new (
2476 aspect => 1,
2477 @_,
2478 )
2479}
2480
2481sub size_request {
2482 (32, 8)
2483}
2484
2485sub _draw {
2486 my ($self) = @_;
2487
2488 return unless $::CONN;#d# manage and cache textures differently
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2490
2491 # TODO animation
2492 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 }
2502}
2503
2504#############################################################################
2505
2506package CFClient::UI::InventoryItem;
2507
2508our @ISA = CFClient::UI::HBox::;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new (
2523 can_hover => 1,
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_,
2578 );
2579
2580 $self
2581}
2582
2583sub set_items {
2584 my ($self, $items) = @_;
2585
2586 $self->{scrolled}->clear;
2587 return unless $items;
2588
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2590
2591 $self->{real_items} = \@items;
2592
2593 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2599 }
2600
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602}
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607}
2608
2609#############################################################################
2610
2611package CFClient::UI::Menu;
2612
2613our @ISA = CFClient::UI::FancyFrame::;
2614
2615use CFClient::OpenGL;
2616
2617sub new {
2618 my $class = shift;
2619
2620 my $self = $class->SUPER::new (
2621 items => [],
2622 z => 100,
2623 @_,
2624 );
2625
2626 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2627
2628 for my $item (@{ $self->{items} }) {
2629 my ($widget, $cb) = @$item;
2630
2631 # handle various types of items, only text for now
2632 if (!ref $widget) {
2633 $widget = new CFClient::UI::Label
2634 can_hover => 1,
2635 can_events => 1,
2636 text => $widget;
2637 }
2638
2639 $self->{item}{$widget} = $item;
2640
2641 $self->{vbox}->add ($widget);
2642 }
2643
2644 $self
2645}
2646
2647# popup given the event (must be a mouse button down event currently)
2648sub popup {
2649 my ($self, $ev) = @_;
2650
2651 $self->emit ("popdown");
2652
2653 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self;
2655 $self->{button} = $ev->{button};
2656
2657 $self->show;
2658 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2659}
2660
2661sub mouse_motion {
2662 my ($self, $ev, $x, $y) = @_;
2663
2664 # TODO: should use vbox->find_widget or so
2665 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2666 $self->{hover} = $self->{item}{$HOVER};
2667}
2668
2669sub button_up {
2670 my ($self, $ev, $x, $y) = @_;
2671
2672 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB;
2674 $self->hide;
2675
2676 $self->emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover};
2678 }
2679}
2680
2681#############################################################################
2682
2091package CFClient::UI::Root; 2683package CFClient::UI::Root;
2092 2684
2093our @ISA = CFClient::UI::Container::; 2685our @ISA = CFClient::UI::Container::;
2094 2686
2095use CFClient::OpenGL; 2687use CFClient::OpenGL;
2096 2688
2097sub check_size { 2689sub check_size {
2098 my ($self) = @_; 2690 my ($self) = @_;
2099 2691
2100 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2692 $self->configure (0, 0, $self->{w}, $self->{h});
2101} 2693}
2102 2694
2103sub size_request { 2695sub size_request {
2104 ($::WIDTH, $::HEIGHT) 2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2699}
2700
2701sub size_allocate {
2702 my ($self, $w, $h) = @_;
2703
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2105} 2722}
2106 2723
2107sub configure { 2724sub configure {
2108 my ($self, $x, $y, $w, $h) = @_; 2725 my ($self, $x, $y, $w, $h) = @_;
2109 2726
2110 $self->SUPER::configure ($x, $y, $w, $h); 2727 $self->SUPER::configure ($x, $y, $w, $h);
2111 2728
2112 for my $child (@{$self->{children}}) { 2729 for my $child ($self->children) {
2113 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2114 2731
2115 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2732 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2116 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2117 $child->configure ($X, $Y, $W,$H); 2734 $child->configure ($X, $Y, $W, $H);
2118 } 2735 }
2119} 2736}
2120 2737
2121sub _topleft { 2738sub _topleft {
2122 my ($self, $x, $y) = @_; 2739 my ($self, $x, $y) = @_;
… …
2170############################################################################# 2787#############################################################################
2171 2788
2172package CFClient::UI; 2789package CFClient::UI;
2173 2790
2174$ROOT = new CFClient::UI::Root; 2791$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip;
2175 2793
21761 27941
2177 2795

Diff Legend

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