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.199 by root, Fri May 12 15:45:42 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17sub check_tooltip {
18 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) {
23 $TOOLTIP->{owner} = $widget;
24
25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
29 $TOOLTIP->set_tooltip_from ($widget);
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 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 delete $TOOLTIP->{owner};
50}
14 51
15# class methods for events 52# class methods for events
16sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
18} 56}
19 57
20sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
22} 61}
23 62
24sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
25 my ($ev) = @_; 64 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 67 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 68 my $widget = $ROOT->find_widget ($x, $y);
30 69
31 $GRAB = $widget; 70 $GRAB = $widget;
32 $GRAB->update if $GRAB; 71 $GRAB->update if $GRAB;
72
73 check_tooltip;
33 } 74 }
34 75
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 77
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 78 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y);
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
38} 82}
39 83
40sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
41 my ($ev) = @_; 85 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
43 87
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 89
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 91
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 92 if ($GRAB) {
93 ($x, $y) = $GRAB->coord2local ($x, $y);
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
49 96
50 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 99 $grab->update if $grab;
53 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
101
102 check_tooltip;
54 } 103 }
55} 104}
56 105
57sub feed_sdl_motion_event { 106sub feed_sdl_motion_event {
58 my ($ev) = @_; 107 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 112 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 113 my $hover = $HOVER; $HOVER = $widget;
65 114
66 $hover->update if $hover && $hover->{can_hover}; 115 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 117
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 118 check_tooltip;
119 }
120
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
71} 125}
72 126
73# convert position array to integers 127# convert position array to integers
74sub harmonize { 128sub harmonize {
75 my ($vals) = @_; 129 my ($vals) = @_;
… …
93 147
94sub new { 148sub new {
95 my $class = shift; 149 my $class = shift;
96 150
97 my $self = bless { 151 my $self = bless {
98 x => 0, 152 x => 0,
99 y => 0, 153 y => 0,
100 z => 0, 154 z => 0,
155 can_events => 1,
101 @_ 156 @_
102 }, $class; 157 }, $class;
103 158
104 for (keys %$self) { 159 for (keys %$self) {
105 if (/^connect_(.*)$/) { 160 if (/^connect_(.*)$/) {
… …
108 } 163 }
109 164
110 $self 165 $self
111} 166}
112 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
113sub show { 175sub show {
114 my ($self) = @_; 176 my ($self) = @_;
115 177
116 return if $self->{parent}; 178 return if $self->{parent};
117 179
… …
119} 181}
120 182
121sub hide { 183sub hide {
122 my ($self) = @_; 184 my ($self) = @_;
123 185
124 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
125 188
126 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
127} 191}
128 192
129sub move { 193sub move {
130 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
131 195
… …
134 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
135 199
136 $self->update; 200 $self->update;
137} 201}
138 202
139sub needs_redraw { 203sub set_size {
140 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
141} 210}
142 211
143sub size_request { 212sub size_request {
144 require Carp; 213 require Carp;
145 Carp::confess "size_request is abstract"; 214 Carp::confess "size_request is abstract";
… …
165 $self->{y} = $y; 234 $self->{y} = $y;
166 $self->update; 235 $self->update;
167 } 236 }
168 237
169 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
170 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
171 $self->{h} = $h;
172
173 $self->size_allocate ($w, $h);
174 $self->update;
175 } 240 }
176} 241}
177 242
178sub size_allocate { 243sub size_allocate {
179 # nothing to be done 244 # nothing to be done
180} 245}
181 246
182# return top left coordinates 247sub children {
183sub _topleft { 248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size {
184 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
185 263
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h;
187} 266}
188 267
189# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
190sub coord2local { 269sub coord2local {
191 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
192 271
193 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 273}
196 274
197# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
198sub coord2global { 276sub coord2global {
199 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
200 278
201 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 280}
204 281
205sub focus_in { 282sub focus_in {
206 my ($self) = @_; 283 my ($self) = @_;
207 284
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
269 glEnd; 346 glEnd;
270 glDisable GL_BLEND; 347 glDisable GL_BLEND;
271 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
272} 363}
273 364
274sub _draw { 365sub _draw {
275 my ($self) = @_; 366 my ($self) = @_;
276 367
277 warn "no draw defined for $self\n"; 368 warn "no draw defined for $self\n";
278} 369}
279 370
280sub find_widget { 371sub find_widget {
281 my ($self, $x, $y) = @_; 372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
282 375
283 return $self 376 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 379
… …
289 382
290sub set_parent { 383sub set_parent {
291 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
292 385
293 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
294} 391}
295 392
296sub check_size { 393sub check_size {
297 my ($self) = @_; 394 my ($self, $forced) = @_;
298 395
299 return unless $self->{parent}; 396 $self->{force_alloc} = 1 if $forced;
300 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
301 my ($w, $h) = $self->size_request;
302
303 if ($w != $self->{req_w} || $h != $self->{req_h}) {
304 $self->{req_w} = $w;
305 $self->{req_h} = $h;
306
307 $self->{parent}->check_size;
308 }
309} 398}
310 399
311sub update { 400sub update {
312 my ($self) = @_; 401 my ($self) = @_;
313 402
… …
322} 411}
323 412
324sub emit { 413sub emit {
325 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
326 415
327 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
328 $cb->($self, @args);
329 }
330} 417}
331 418
332sub DESTROY { 419sub DESTROY {
333 my ($self) = @_; 420 my ($self) = @_;
334 421
… …
379 466
380package CFClient::UI::Empty; 467package CFClient::UI::Empty;
381 468
382our @ISA = CFClient::UI::Base::; 469our @ISA = CFClient::UI::Base::;
383 470
471sub new {
472 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg);
474}
475
384sub size_request { 476sub size_request {
385 (0, 0) 477 (0, 0)
386} 478}
387 479
388sub draw { } 480sub draw { }
… …
396sub new { 488sub new {
397 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
398 490
399 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
400 492
401 my $self = $class->SUPER::new (children => [], %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
402 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
403 499
404 $self 500 $self
405} 501}
406 502
407sub add { 503sub add {
408 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
409 505
410 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
411 508
412 use sort 'stable'; 509 use sort 'stable';
413 510
414 $self->{children} = [ 511 $self->{children} = [
415 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
416 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
417 ]; 514 ];
418 515
419 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
420} 522}
421 523
422sub remove { 524sub remove {
423 my ($self, $child) = @_; 525 my ($self, $child) = @_;
424 526
425 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
426 529
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 531
429 $self->check_size; 532 $self->check_size;
533 $self->update;
534}
535
536sub clear {
537 my ($self) = @_;
538
539 my $children = delete $self->{children};
540 $self->{children} = [];
541
542 for (@$children) {
543 delete $_->{parent};
544 $_->hide;
545 }
546
547 $self->check_size;
548 $self->update;
430} 549}
431 550
432sub find_widget { 551sub find_widget {
433 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
434 553
… …
509} 628}
510 629
511sub update { 630sub update {
512 my ($self) = @_; 631 my ($self) = @_;
513 632
514 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
515 $self->render_chld;
516 $self->SUPER::update; 634 $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} 635}
528 636
529sub size_allocate { 637sub size_allocate {
530 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
531 639
532 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
533 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
648sub render_child {
649 my ($self) = @_;
650
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT;
654
534 $self->render_chld; 655 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 };
535} 664}
536 665
537sub _draw { 666sub _draw {
538 my ($self) = @_; 667 my ($self) = @_;
539 668
540 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
541 670
542 my $tex = $self->{texture} 671 my $tex = $self->{texture}
543 or return; 672 or return;
544 673
545 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
547 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1;
549 677
550 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
551 679
552 glDisable GL_BLEND;
553 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
554} 681}
555 682
556############################################################################# 683#############################################################################
557 684
558package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
559 686
560our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
561 688
562sub new { die }
563
564sub size_request { 689sub size_request {
565 my ($self) = @_; 690 my ($self) = @_;
566 691
567 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$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)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
569 694
570 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
571} 696}
572 697
573sub _draw { 698sub size_allocate {
574 my ($self) = @_; 699 my ($self, $w, $h) = @_;
575 700
576 $self->{children}[1]->draw; 701 $self->update;
577} 702}
578 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
579 706
580############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
581 709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
582package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
583 752
584our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
585
586use CFClient::OpenGL;
587 754
588sub new { 755sub new {
589 my $class = shift; 756 my $class = shift;
590 757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
591 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
592 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
593 border_bg => [1, 1, 1, 1], 770 slider => $slider,
594 border => 0.8,
595 @_ 771 @_,
596 ); 772 );
597 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
598 $self 778 $self
599} 779}
600 780
601sub set_size { 781#TODO# update range on size_allocate depending on child
602 my ($self, $w, $h) = @_; 782# update viewport offset on scroll
603 $self->{req_w} = $w;
604 $self->{req_h} = $h;
605 $self->check_size;
606}
607 783
608sub size_request { 784#############################################################################
609 my ($self) = @_;
610 ($self->{req_w}, $self->{req_h})
611}
612 785
613sub size_allocate { 786package CFClient::UI::Frame;
614 my ($self, $w, $h) = @_; 787
615 $self->{w} = $w; 788our @ISA = CFClient::UI::Bin::;
616 $self->{h} = $h; 789
617 $self->child->configure (0, 0, $w, $h); 790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 $class->SUPER::new (
796 bg => undef,
797 @_,
798 )
618} 799}
619 800
620sub _draw { 801sub _draw {
621 my ($self) = @_; 802 my ($self) = @_;
622 803
623 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
624 806
625 glEnable GL_BLEND; 807 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
627 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
629 810
630# glBegin GL_QUADS; 811 glBegin GL_QUADS;
631# glColor 0, 0, 0, 0;
632# glVertex 0 , 0; 812 glVertex 0 , 0;
633# glVertex 0 , $h; 813 glVertex 0 , $h;
634# glVertex $w, $h; 814 glVertex $w, $h;
635# glVertex $w, 0; 815 glVertex $w, 0;
636# glEnd; 816 glEnd;
637 817
638
639 $self->child->draw;
640 glDisable GL_BLEND; 818 glDisable GL_BLEND;
641 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
642} 822}
643 823
644############################################################################# 824#############################################################################
645 825
646package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
657 my $class = shift; 837 my $class = shift;
658 838
659 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
660 840
661 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
664 border => 0.8, 844 border => 0.6,
845 can_events => 1,
665 @_ 846 @_
666 ); 847 );
667 848
668 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 850 align => 0,
670 valign => 1, 851 valign => 1,
671 text => $self->{title}, 852 text => $self->{title},
672 fontsize => 1; 853 fontsize => $self->{border};
673 854
674 $self 855 $self
675} 856}
676 857
677sub border { 858sub border {
678 int $_[0]{border} * $::FONTSIZE 859 int $_[0]{border} * $::FONTSIZE
679} 860}
680 861
681sub size_request { 862sub size_request {
682 my ($self) = @_; 863 my ($self) = @_;
683
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685 864
686 my ($w, $h) = $self->SUPER::size_request; 865 my ($w, $h) = $self->SUPER::size_request;
687 866
688 ( 867 (
689 $w + $self->border * 2, 868 $w + $self->border * 2,
… …
704} 883}
705 884
706sub button_down { 885sub button_down {
707 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
708 887
888 my ($w, $h) = @$self{qw(w h)};
709 my $border = $self->border; 889 my $border = $self->border;
710 890
711 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
712 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
713 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
714 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
715 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
716 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
717 $self->{motion} = sub { 902 $self->{motion} = sub {
718 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
719 904
720 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
721 907
722 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
723 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
724 $self->check_size; 911 $self->check_size;
725 }; 912 };
726 913
727 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
728 && $y >= 0 && $y < $border) {
729
730 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
731 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
732 917
733 $self->{motion} = sub { 918 $self->{motion} = sub {
734 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
757 my ($self) = @_; 942 my ($self) = @_;
758 943
759 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
760 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
761 946
762 glEnable GL_BLEND;
763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
764 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
766 949
767 my $border = $self->border; 950 my $border = $self->border;
768 951
769 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
770 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
771 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
772 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
773 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
774 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
775 my $bg = $tex[0]; 959 my $bg = $tex[0];
776 960
777 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
778 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
779 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
780 964
781 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
782 966
783 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
784 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
785 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
786 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
787 972
788 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
789 glDisable GL_BLEND;
790 974
791 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
792 $self->child->draw; 977 $self->child->draw;
793} 978}
794 979
795############################################################################# 980#############################################################################
796 981
… …
818 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
819 1004
820 $child->check_size; 1005 $child->check_size;
821} 1006}
822 1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
823# TODO: move to container class maybe? send childs a signal on removal? 1012# TODO: move to container class maybe? send childs a signal on removal?
824sub clear { 1013sub clear {
825 my ($self) = @_; 1014 my ($self) = @_;
826 1015
1016 my @children = $self->children;
827 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
828 $self->update; 1024 $self->update;
829} 1025}
830 1026
831sub get_wh { 1027sub get_wh {
832 my ($self) = @_; 1028 my ($self) = @_;
… …
1009} 1205}
1010 1206
1011sub size_allocate { 1207sub size_allocate {
1012 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1013 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1014 my $children = $self->{children}; 1212 my $children = $self->{children};
1015 1213
1016 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1017 1215
1018 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1055 1253
1056sub new { 1254sub new {
1057 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1058 1256
1059 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1060 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1061 fontsize => 1, 1263 fontsize => 1,
1062 text => "",
1063 align => -1, 1264 align => -1,
1064 valign => -1, 1265 valign => -1,
1065 padding => 2, 1266 padding => 2,
1066 layout => new CFClient::Layout, 1267 can_events => 0,
1067 %arg 1268 %arg
1068 ); 1269 );
1069 1270
1070 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1072 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1073 $self->{template} = $layout; 1274 $self->{template} = $layout;
1074 } 1275 }
1075 1276
1076 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1078 1282
1079 $self 1283 $self
1080} 1284}
1081 1285
1082sub escape_text { 1286sub escape {
1083 local $_ = $_[1]; 1287 local $_ = $_[1];
1084 1288
1085 s/&/&amp;/g; 1289 s/&/&amp;/g;
1086 s/>/&gt;/g; 1290 s/>/&gt;/g;
1087 s/</&lt;/g; 1291 s/</&lt;/g;
1088 1292
1089 $_[1] 1293 $_[1]
1090} 1294}
1091 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1092sub set_text { 1303sub set_text {
1093 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1094 1305
1306 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text";
1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1095 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1096 1311
1097 delete $self->{texture}; 1312 $self->update;
1098 $self->check_size; 1313 $self->check_size;
1099 $self->update;
1100} 1314}
1101 1315
1102sub set_markup { 1316sub set_markup {
1103 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1104 1318
1319 return if $self->{text} eq "M$markup";
1320 $self->{text} = "M$markup";
1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1105 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1106 1326
1107 delete $self->{texture}; 1327 $self->update;
1108 $self->check_size; 1328 $self->check_size;
1109 $self->update;
1110} 1329}
1111 1330
1112sub size_request { 1331sub size_request {
1113 my ($self) = @_; 1332 my ($self) = @_;
1114 1333
1115 $self->{layout}->set_width; 1334 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1);
1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1117 1337
1118 my ($w, $h) = $self->{layout}->size; 1338 my ($w, $h) = $self->{layout}->size;
1119 1339
1120 if (exists $self->{template}) { 1340 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font};
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122 1343
1123 my ($w2, $h2) = $self->{template}->size; 1344 my ($w2, $h2) = $self->{template}->size;
1124 1345
1125 $w = List::Util::max $w, $w2; 1346 $w = List::Util::max $w, $w2;
… …
1140 1361
1141sub set_fontsize { 1362sub set_fontsize {
1142 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1143 1364
1144 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1366 delete $self->{texture};
1367
1368 $self->update;
1145 $self->check_size; 1369 $self->check_size;
1146} 1370}
1147 1371
1148sub _draw { 1372sub _draw {
1149 my ($self) = @_; 1373 my ($self) = @_;
1150 1374
1151 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1152 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1154 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1155 }; 1392 };
1156 1393
1157 glEnable GL_BLEND;
1158 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1159 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1161 1396
1397 if ($tex->{format} == GL_ALPHA) {
1162 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1163
1164 $self->{ox} = int (
1165 $self->{align} < 0 ? $self->{padding}
1166 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1167 : ($self->{w} - $tex->{w}) * 0.5
1168 );
1169
1170 $self->{oy} = int (
1171 $self->{valign} < 0 ? $self->{padding}
1172 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1173 : ($self->{h} - $tex->{h}) * 0.5
1174 );
1175
1176 $tex->draw_quad ($self->{ox}, $self->{oy}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1177 1403
1178 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1179 glDisable GL_BLEND;
1180} 1405}
1181 1406
1182############################################################################# 1407#############################################################################
1183 1408
1184package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1189 1414
1190sub new { 1415sub new {
1191 my $class = shift; 1416 my $class = shift;
1192 1417
1193 $class->SUPER::new ( 1418 $class->SUPER::new (
1194 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1195 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1196 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1198 can_hover => 1, 1423 can_hover => 1,
1199 can_focus => 1, 1424 can_focus => 1,
1200 valign => 0, 1425 valign => 0,
1426 can_events => 1,
1201 @_ 1427 @_
1202 ) 1428 )
1203} 1429}
1204 1430
1205sub _set_text { 1431sub _set_text {
… …
1218 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1219 1445
1220 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1221} 1447}
1222 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1223sub get_text { 1458sub get_text {
1224 $_[0]{text} 1459 $_[0]{text}
1225} 1460}
1226 1461
1227sub size_request { 1462sub size_request {
… …
1234 1469
1235sub size_allocate { 1470sub size_allocate {
1236 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1237 1472
1238 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1239}
1240
1241sub set_text {
1242 my ($self, $text) = @_;
1243
1244 $self->{cursor} = length $text;
1245 $self->_set_text ($text);
1246 $self->update;
1247} 1474}
1248 1475
1249sub key_down { 1476sub key_down {
1250 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1251 1478
… …
1358 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1359 1586
1360 my $sym = $ev->{sym}; 1587 my $sym = $ev->{sym};
1361 1588
1362 if ($sym == 13) { 1589 if ($sym == 13) {
1590 unshift @{$self->{history}},
1591 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = '';
1363 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1364 $self->update; 1595 $self->update;
1596
1597 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text;
1600 }
1601 if (@{$self->{history} || []} > 0) {
1602 $self->{history_pointer}++;
1603 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1604 $self->{history_pointer} = @{$self->{history} || []} - 1;
1605 }
1606 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1607 }
1608
1609 } elsif ($sym == CFClient::SDLK_DOWN) {
1610 $self->{history_pointer}--;
1611 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1612
1613 if ($self->{history_pointer} >= 0) {
1614 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1615 } else {
1616 $self->set_text ($self->{history_saveback});
1617 }
1365 1618
1366 } else { 1619 } else {
1367 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1368 } 1621 }
1369 1622
… …
1383 1636
1384sub new { 1637sub new {
1385 my $class = shift; 1638 my $class = shift;
1386 1639
1387 $class->SUPER::new ( 1640 $class->SUPER::new (
1388 padding => 4, 1641 padding => 4,
1389 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1390 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1392 can_hover => 1, 1645 can_hover => 1,
1393 align => 0, 1646 align => 0,
1394 valign => 0, 1647 valign => 0,
1648 can_events => 1,
1395 @_ 1649 @_
1396 ) 1650 )
1397} 1651}
1398 1652
1399sub button_up { 1653sub button_up {
… …
1412 1666
1413 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1414 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1415 } 1669 }
1416 1670
1417 glEnable GL_BLEND;
1418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1419 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1421 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1422 1674
1423 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1424 1676
1425 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1426 glDisable GL_BLEND;
1427 1678
1428 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1429} 1680}
1430 1681
1431############################################################################# 1682#############################################################################
… …
1478 1729
1479 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1480 1731
1481 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1482 1733
1483 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1484 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1485 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1486
1487 my $tex = $self->{state} ? $tex[1] : $tex[0];
1488
1489 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1490
1491 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1492 glDisable GL_BLEND;
1493} 1739}
1494 1740
1495############################################################################# 1741#############################################################################
1496 1742
1497package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1504our %loaded_images; 1750our %loaded_images;
1505 1751
1506sub new { 1752sub new {
1507 my $class = shift; 1753 my $class = shift;
1508 1754
1509 my $self = $class->SUPER::new (@_); 1755 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1756
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1757 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1758
1513 $loaded_images{$self->{image}} ||= 1759 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1760 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1540 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1541 1787
1542 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1543 } 1789 }
1544 1790
1545 glEnable GL_BLEND;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1549 1793
1550 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1551 1795
1552 glDisable GL_BLEND;
1553 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1554} 1797}
1555 1798
1556############################################################################# 1799#############################################################################
1557 1800
1558package CFClient::UI::VGauge; 1801package CFClient::UI::VGauge;
1559 1802
1560our @ISA = CFClient::UI::Base::; 1803our @ISA = CFClient::UI::Base::;
1804
1805use List::Util qw(min max);
1561 1806
1562use CFClient::OpenGL; 1807use CFClient::OpenGL;
1563 1808
1564my %tex = ( 1809my %tex = (
1565 food => [ 1810 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1811 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1812 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ], 1813 ],
1569 grace => [ 1814 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1815 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1816 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1572 ], 1817 ],
1573 hp => [ 1818 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1820 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ], 1821 ],
1577 mana => [ 1822 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1824 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1580 ], 1825 ],
1581); 1826);
1582 1827
1583# eg. VGauge->new (gauge => 'food'), default gauge: food 1828# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new { 1829sub new {
… …
1603} 1848}
1604 1849
1605sub set_max { 1850sub set_max {
1606 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1607 1852
1853 return if $self->{max_val} == $max;
1854
1608 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1609} 1857}
1610 1858
1611sub set_value { 1859sub set_value {
1612 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1613 1861
1614 $self->set_max ($max) 1862 $self->set_max ($max)
1615 if defined $max; 1863 if defined $max;
1616 1864
1617 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1618 $self->{val} = $val; 1867 $self->{val} = $val;
1619
1620 $self->update; 1868 $self->update;
1621} 1869}
1622 1870
1623sub _draw { 1871sub _draw {
1624 my ($self) = @_; 1872 my ($self) = @_;
1625 1873
1626 my $tex = $tex{$self->{type}}; 1874 my $tex = $tex{$self->{type}};
1875 my ($t1, $t2, $t3) = @$tex;
1627 1876
1628 my ($w, $h) = ($self->{w}, $self->{h}); 1877 my ($w, $h) = ($self->{w}, $self->{h});
1629 1878
1630 if ($self->{vertical}) { 1879 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1; 1880 glRotate 90, 0, 0, 1;
… …
1633 1882
1634 ($w, $h) = ($h, $w); 1883 ($w, $h) = ($h, $w);
1635 } 1884 }
1636 1885
1637 my $ycut = $self->{val} / ($self->{max_val} || 1); 1886 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639 1887
1640 my $t1 = $tex->[0]; 1888 my $ycut1 = max 0, min 1, $ycut;
1641 my $t2 = $tex->[1]; 1889 my $ycut2 = max 0, min 1, $ycut - 1;
1890
1891 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2);
1642 1893
1643 glEnable GL_BLEND; 1894 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D; 1896 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 1898
1648 my $h1 = $self->{h} - $ycut * $self->{h};
1649 my $h2 = $ycut * $self->{h};
1650
1651 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1899 glBindTexture GL_TEXTURE_2D, $t1->{name};
1652 glBegin GL_QUADS; 1900 glBegin GL_QUADS;
1653 glTexCoord 0 , 0; glVertex 0 , 0; 1901 glTexCoord 0 , 0; glVertex 0 , 0;
1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1902 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1903 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1656 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1904 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1657 glEnd; 1905 glEnd;
1658 1906
1907 my $ycut1 = List::Util::min 1, $ycut;
1659 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1908 glBindTexture GL_TEXTURE_2D, $t2->{name};
1660 glBegin GL_QUADS; 1909 glBegin GL_QUADS;
1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1910 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1911 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1912 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1913 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1665 glEnd; 1914 glEnd;
1915
1916 if ($t3) {
1917 glBindTexture GL_TEXTURE_2D, $t3->{name};
1918 glBegin GL_QUADS;
1919 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1920 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1921 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1922 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1923 glEnd;
1924 }
1666 1925
1667 glDisable GL_BLEND; 1926 glDisable GL_BLEND;
1668 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1669} 1928}
1670 1929
… …
1673package CFClient::UI::Gauge; 1932package CFClient::UI::Gauge;
1674 1933
1675our @ISA = CFClient::UI::VBox::; 1934our @ISA = CFClient::UI::VBox::;
1676 1935
1677sub new { 1936sub new {
1678 my ($class, %arg) = shift; 1937 my ($class, %arg) = @_;
1679 1938
1680 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
1681 @_, 1940 tooltip => $arg{type},
1941 can_hover => 1,
1942 can_events => 1,
1943 %arg,
1682 ); 1944 );
1683 1945
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1946 $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); 1947 $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"); 1948 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1949
1688 $self 1950 $self
1689} 1951}
1690 1952
1691sub set_fontsize { 1953sub set_fontsize {
… …
1693 1955
1694 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1695 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1696} 1958}
1697 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1698sub set_value { 1967sub set_value {
1699 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1700 1969
1701 $self->set_max ($max) 1970 $self->set_max ($max)
1702 if defined $max; 1971 if defined $max;
1703 1972
1704 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1705 $self->{value}->set_text ($val); 1974 $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} 1975}
1714 1976
1715############################################################################# 1977#############################################################################
1716 1978
1717package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1736 # TODO: calculations are off 1998 # TODO: calculations are off
1737 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1738 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1739 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1740 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1741 req_w => 20, 2003 req_w => $::WIDTH / 80,
1742 req_h => 20, 2004 req_h => $::WIDTH / 80,
1743 vertical => 0, 2005 vertical => 0,
1744 can_hover => 1, 2006 can_hover => 1,
1745 inner_pad => 5, 2007 inner_pad => 5,
1746 @_ 2008 @_
1747 ); 2009 );
… …
1830 $page ||= 2; 2092 $page ||= 2;
1831 2093
1832 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1833 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1834 2096
1835 glEnable GL_BLEND;
1836 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1837 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 2099
1840 # draw background 2100 # draw background
1841 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1842 2102
1843 # draw handle 2103 # draw handle
1844 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1845 2105
1846 glDisable GL_BLEND;
1847 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1848} 2107}
1849 2108
1850############################################################################# 2109#############################################################################
1851 2110
… …
1857 2116
1858sub new { 2117sub new {
1859 my $class = shift; 2118 my $class = shift;
1860 2119
1861 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1862 fontsize => 1, 2121 fontsize => 1,
2122 can_events => 0,
2123 #font => default_font
1863 @_, 2124 @_,
1864 2125
1865 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1866 par => [], 2127 par => [],
1867 height => 0, 2128 height => 0,
1868 children => [ 2129 children => [
1869 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1870 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1871 ], 2132 ],
1872 ); 2133 );
1873 2134
1874 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1875 $self->update;
1876 });
1877 2136
1878 $self 2137 $self
1879} 2138}
1880 2139
1881sub set_fontsize { 2140sub set_fontsize {
… …
1889 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1890 2149
1891 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1892 2151
1893 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1894 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1895 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1896 2155
1897 ($layout->size)[1] 2156 ($layout->size)[1]
1898} 2157}
1899 2158
1900sub reflow { 2159sub reflow {
… …
1907sub size_allocate { 2166sub size_allocate {
1908 my ($self, $w, $h) = @_; 2167 my ($self, $w, $h) = @_;
1909 2168
1910 $self->SUPER::size_allocate ($w, $h); 2169 $self->SUPER::size_allocate ($w, $h);
1911 2170
2171 $self->{layout}->set_font ($self->{font}) if $self->{font};
1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $self->{layout}->set_width ($self->{children}[0]{w}); 2173 $self->{layout}->set_width ($self->{children}[0]{w});
1914 2174
1915 $self->reflow; 2175 $self->reflow;
1916} 2176}
… …
1937 2197
1938 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
1939 2199
1940 delete $self->{texture}; 2200 delete $self->{texture};
1941 2201
1942 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
1943 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
1944 my $height = 0; 2204 my $height = 0;
1945 2205
1946 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
1947 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
1951 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1952 2212
1953 delete $self->{texture}; 2213 delete $self->{texture};
1954 } 2214 }
1955 2215
1956 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1957 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
1958 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
1959 2219
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964 2222
1965 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
1966 2224
… …
1969 2227
1970 my $y = 0; 2228 my $y = 0;
1971 2229
1972 my $layout = $self->{layout}; 2230 my $layout = $self->{layout};
1973 2231
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
1974 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
1975 my $h = $par->[0]; 2235 my $h = $par->[0];
1976 2236
1977 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
1978 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
1979 2240
1980 glColor @{ $par->[1] };
1981 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
1982 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1983 } 2243 }
1984 2244
1985 $y += $h; 2245 $y += $h;
1986 } 2246 }
1987 2247
1988 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
1989 glDisable GL_BLEND;
1990 }; 2249 };
1991 }); 2250 });
1992} 2251}
1993 2252
1994sub _draw { 2253sub _draw {
1995 my ($self) = @_; 2254 my ($self) = @_;
1996 2255
1997 if ($self->{texture}) {
1998 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2258 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2001 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2002 }
2003 2261
2004 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2005 2263
2006} 2264}
2007 2265
… …
2055 2313
2056sub new { 2314sub new {
2057 my $class = shift; 2315 my $class = shift;
2058 2316
2059 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2060 state => 0, 2318 state => 0,
2061 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2062 @_ 2320 @_
2063 ); 2321 );
2064 2322
2065 if ($self->{state}) { 2323 if ($self->{state}) {
… …
2086 $self->emit (changed => $self->{state}); 2344 $self->emit (changed => $self->{state});
2087} 2345}
2088 2346
2089############################################################################# 2347#############################################################################
2090 2348
2349package CFClient::UI::Tooltip;
2350
2351our @ISA = CFClient::UI::Bin::;
2352
2353use CFClient::OpenGL;
2354
2355sub new {
2356 my $class = shift;
2357
2358 $class->SUPER::new (
2359 @_,
2360 can_events => 0,
2361 )
2362}
2363
2364sub set_tooltip_from {
2365 my ($self, $widget) = @_;
2366
2367 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip},
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2374}
2375
2376sub size_request {
2377 my ($self) = @_;
2378
2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2380
2381 ($w + 4, $h + 4)
2382}
2383
2384sub size_allocate {
2385 my ($self, $w, $h) = @_;
2386
2387 $self->SUPER::size_allocate ($w - 4, $h - 4);
2388}
2389
2390sub _draw {
2391 my ($self) = @_;
2392
2393 glTranslate 0.375, 0.375;
2394
2395 my ($w, $h) = @$self{qw(w h)};
2396
2397 glColor 1, 0.8, 0.4;
2398 glBegin GL_QUADS;
2399 glVertex 0 , 0;
2400 glVertex 0 , $h;
2401 glVertex $w, $h;
2402 glVertex $w, 0;
2403 glEnd;
2404
2405 glColor 0, 0, 0;
2406 glBegin GL_LINE_LOOP;
2407 glVertex 0 , 0;
2408 glVertex 0 , $h;
2409 glVertex $w, $h;
2410 glVertex $w, 0;
2411 glEnd;
2412
2413 glTranslate 2 - 0.375, 2 - 0.375;
2414 $self->SUPER::_draw;
2415}
2416
2417#############################################################################
2418
2419package CFClient::UI::Face;
2420
2421our @ISA = CFClient::UI::Base::;
2422
2423use CFClient::OpenGL;
2424
2425sub new {
2426 my $class = shift;
2427
2428 $class->SUPER::new (
2429 aspect => 1,
2430 @_,
2431 )
2432}
2433
2434sub size_request {
2435 (32, 8)
2436}
2437
2438sub _draw {
2439 my ($self) = @_;
2440
2441 return unless $::CONN;#d# manage and cache textures differently
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2443
2444 # TODO animation
2445 if ($tex) {
2446 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D;
2451 }
2452}
2453
2454#############################################################################
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Menu;
2566
2567our @ISA = CFClient::UI::FancyFrame::;
2568
2569use CFClient::OpenGL;
2570
2571sub new {
2572 my $class = shift;
2573
2574 my $self = $class->SUPER::new (
2575 items => [],
2576 z => 100,
2577 @_,
2578 );
2579
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2581
2582 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item;
2584
2585 # handle various types of items, only text for now
2586 if (!ref $widget) {
2587 $widget = new CFClient::UI::Label
2588 can_hover => 1,
2589 can_events => 1,
2590 text => $widget;
2591 }
2592
2593 $self->{item}{$widget} = $item;
2594
2595 $self->{vbox}->add ($widget);
2596 }
2597
2598 $self
2599}
2600
2601# popup given the event (must be a mouse button down event currently)
2602sub popup {
2603 my ($self, $ev) = @_;
2604
2605 $self->emit ("popdown");
2606
2607 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self;
2609 $self->{button} = $ev->{button};
2610
2611 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613}
2614
2615sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_;
2617
2618 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER};
2621}
2622
2623sub button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB;
2628 $self->hide;
2629
2630 $self->emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover};
2632 }
2633}
2634
2635#############################################################################
2636
2637package CFClient::UI::Statusbox;
2638
2639our @ISA = CFClient::UI::VBox::;
2640
2641sub reorder {
2642 my ($self) = @_;
2643 my $NOW = time;
2644
2645 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 }
2648
2649 my @widgets;
2650
2651 my @items = sort {
2652 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} };
2655
2656 my $count = 10 + 1;
2657 for my $item (@items) {
2658 last unless --$count;
2659
2660 push @widgets, $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text};
2665
2666 for ($short) {
2667 s/^\s+//;
2668 s/\012.*/…/s;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 }
2672
2673 new CFClient::UI::Label
2674 markup => $short,
2675 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize},
2679 color => $item->{color},
2680 can_events => 1,
2681 can_hover => 1
2682 };
2683 }
2684
2685 $self->clear;
2686 $self->SUPER::add (reverse @widgets);
2687}
2688
2689sub add {
2690 my ($self, $text, %arg) = @_;
2691
2692 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//;
2694
2695 my $timeout = time + ((delete $arg{timeout}) || 60);
2696
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698
2699 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) {
2701 $item->{count}++;
2702 } else {
2703 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text;
2705 }
2706 $item->{id} = ++$self->{id};
2707 $item->{timeout} = $timeout;
2708 delete $item->{label};
2709 } else {
2710 $self->{item}{$group} = {
2711 id => ++$self->{id},
2712 text => $text,
2713 timeout => $timeout,
2714 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0,
2718 count => 1,
2719 %arg,
2720 };
2721 }
2722
2723 $self->reorder;
2724}
2725
2726#############################################################################
2727
2091package CFClient::UI::Root; 2728package CFClient::UI::Root;
2092 2729
2093our @ISA = CFClient::UI::Container::; 2730our @ISA = CFClient::UI::Container::;
2094 2731
2095use CFClient::OpenGL; 2732use CFClient::OpenGL;
2096 2733
2097sub check_size { 2734sub new {
2098 my ($self) = @_; 2735 my $class = shift;
2099 2736
2100 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2737 $class->SUPER::new (
2101} 2738 @_,
2102 2739 )
2103sub size_request {
2104 ($::WIDTH, $::HEIGHT)
2105} 2740}
2106 2741
2107sub configure { 2742sub configure {
2108 my ($self, $x, $y, $w, $h) = @_; 2743 my ($self, $x, $y, $w, $h) = @_;
2109 2744
2110 $self->SUPER::configure ($x, $y, $w, $h); 2745 $self->{w} = $w;
2746 $self->{h} = $h;
2747}
2111 2748
2749sub check_size {
2750 my ($self) = @_;
2751
2752 $self->size_allocate ($self->{w}, $self->{h})
2753 if $self->{w};
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758
2759 ($self->{w}, $self->{h})
2760}
2761
2762sub size_allocate {
2763 my ($self, $w, $h) = @_;
2764
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2112 for my $child (@{$self->{children}}) { 2781 for my $child ($self->children) {
2113 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2114 2783
2115 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2784 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2116 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2117 $child->configure ($X, $Y, $W,$H); 2786 $child->configure ($X, $Y, $W, $H);
2118 } 2787 }
2119}
2120 2788
2121sub _topleft { 2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791}
2792
2793sub coord2local {
2122 my ($self, $x, $y) = @_; 2794 my ($self, $x, $y) = @_;
2123 2795
2124 ($x, $y) 2796 ($x, $y)
2125} 2797}
2126 2798
2799sub coord2global {
2800 my ($self, $x, $y) = @_;
2801
2802 ($x, $y)
2803}
2804
2127sub update { 2805sub update {
2128 my ($self) = @_; 2806 my ($self) = @_;
2129 2807
2130 $self->check_size; 2808 $self->check_size;
2131 ::refresh (); 2809 $::WANT_REFRESH++;
2132} 2810}
2133 2811
2134sub add { 2812sub add {
2135 my ($self, $child) = @_; 2813 my ($self, $child) = @_;
2136 2814
2137 # integerize window positions 2815 # integerise window positions
2138 $child->{x} = int $child->{x}; 2816 $child->{x} = int $child->{x};
2139 $child->{y} = int $child->{y}; 2817 $child->{y} = int $child->{y};
2140 2818
2141 $self->SUPER::add ($child); 2819 $self->SUPER::add ($child);
2142} 2820}
… …
2145 my ($self, $id, $cb) = @_; 2823 my ($self, $id, $cb) = @_;
2146 2824
2147 $self->{refresh_hook}{$id} = $cb; 2825 $self->{refresh_hook}{$id} = $cb;
2148} 2826}
2149 2827
2828sub on_post_alloc {
2829 my ($self, $id, $cb) = @_;
2830
2831 $self->{post_alloc_hook}{$id} = $cb;
2832}
2833
2150sub draw { 2834sub draw {
2151 my ($self) = @_; 2835 my ($self) = @_;
2152 2836
2153 while (my $rcb = delete $self->{refresh_hook}) { 2837 while ($self->{refresh_hook}) {
2154 $_->() for values %$rcb; 2838 $_->()
2839 for values %{delete $self->{refresh_hook}};
2840 }
2841
2842 if ($self->{check_size}) {
2843 my @queue = ([], []);
2844
2845 for (;;) {
2846 if ($self->{check_size}) {
2847 # heuristic: check containers last
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2849 for values %{delete $self->{check_size}}
2850 }
2851
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2853
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2855 ? @$widget{qw(user_w user_h)}
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861
2862 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h;
2864
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2866
2867 $widget->{parent}->check_size
2868 if $widget->{parent};
2869 }
2870 }
2871 }
2872
2873 while ($self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) {
2875 my ($widget, $w, $h) = @$_;
2876
2877 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0;
2879
2880 $widget->{w} = $w;
2881 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h);
2883 $widget->emit (size_allocate => $w, $h);
2884 }
2885 }
2886
2887 while ($self->{post_alloc_hook}) {
2888 $_->()
2889 for values %{delete $self->{post_alloc_hook}};
2155 } 2890 }
2156 2891
2157 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2892 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2158 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2159 glClear GL_COLOR_BUFFER_BIT; 2894 glClear GL_COLOR_BUFFER_BIT;
… …
2170############################################################################# 2905#############################################################################
2171 2906
2172package CFClient::UI; 2907package CFClient::UI;
2173 2908
2174$ROOT = new CFClient::UI::Root; 2909$ROOT = new CFClient::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip;
2175 2911
21761 29121
2177 2913

Diff Legend

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