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.143 by root, Thu Apr 20 21:28:51 2006 UTC vs.
Revision 1.190 by root, Mon May 8 22:17:38 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is abtract"; 212 Carp::confess "size_request is abstract";
146} 213}
147 214
148sub configure { 215sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 216 my ($self, $x, $y, $w, $h) = @_;
150 217
… …
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 219 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 220 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154 221
155 # use alignment to adjust x, y 222 # use alignment to adjust x, y
156 223
157 $x += ($w - $w2) * 0.5; 224 $x += int +($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5; 225 $y += int +($h - $h2) * 0.5;
159 226
160 ($w, $h) = ($w2, $h2); 227 ($w, $h) = ($w2, $h2);
161 } 228 }
162 229
163 if ($self->{x} != $x || $self->{y} != $y) { 230 if ($self->{x} != $x || $self->{y} != $y) {
… …
170 $self->{w} = $w; 237 $self->{w} = $w;
171 $self->{h} = $h; 238 $self->{h} = $h;
172 239
173 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
174 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
175 } 243 }
176} 244}
177 245
178sub size_allocate { 246sub size_allocate {
179 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263}
264
265sub set_max_size {
266 my ($self, $w, $h) = @_;
267
268 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h;
180} 270}
181 271
182# return top left coordinates 272# return top left coordinates
183sub _topleft { 273sub _topleft {
184 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
185 278
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187} 280}
188 281
189# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 360 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 361 glVertex $x , $y + $self->{h};
269 glEnd; 362 glEnd;
270 glDisable GL_BLEND; 363 glDisable GL_BLEND;
271 } 364 }
365
366 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix;
368 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0;
372 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h};
375 glEnd;
376 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 }
272} 379}
273 380
274sub _draw { 381sub _draw {
275 my ($self) = @_; 382 my ($self) = @_;
276 383
277 warn "no draw defined for $self\n"; 384 warn "no draw defined for $self\n";
278} 385}
279 386
280sub find_widget { 387sub find_widget {
281 my ($self, $x, $y) = @_; 388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
282 391
283 return $self 392 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 395
… …
294} 403}
295 404
296sub check_size { 405sub check_size {
297 my ($self) = @_; 406 my ($self) = @_;
298 407
299 my ($w, $h) = $self->size_request; 408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
300 412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self};
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 437 $self->{req_w} = $w;
303 $self->{req_h} = $h; 438 $self->{req_h} = $h;
304 439
305 $self->{parent}->check_size 440 $self->{parent}->_check_size
306 if $self->{parent}; 441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
307 } 449 }
308} 450}
309 451
310sub update { 452sub update {
311 my ($self) = @_; 453 my ($self) = @_;
312 454
313 $self->{parent}->update 455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
314 if $self->{parent}; 456
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
315} 468}
316 469
317sub connect { 470sub connect {
318 my ($self, $signal, $cb) = @_; 471 my ($self, $signal, $cb) = @_;
319 472
… …
321} 474}
322 475
323sub emit { 476sub emit {
324 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
325 478
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 480}
330 481
331sub DESTROY { 482sub DESTROY {
332 my ($self) = @_; 483 my ($self) = @_;
333 484
… …
378 529
379package CFClient::UI::Empty; 530package CFClient::UI::Empty;
380 531
381our @ISA = CFClient::UI::Base::; 532our @ISA = CFClient::UI::Base::;
382 533
534sub new {
535 my ($class, %arg) = @_;
536 $class->SUPER::new (can_events => 0, %arg);
537}
538
383sub size_request { 539sub size_request {
384 (0, 0) 540 (0, 0)
385} 541}
386 542
387sub draw { } 543sub draw { }
… …
395sub new { 551sub new {
396 my ($class, %arg) = @_; 552 my ($class, %arg) = @_;
397 553
398 my $children = delete $arg{children} || []; 554 my $children = delete $arg{children} || [];
399 555
400 my $self = $class->SUPER::new (children => [], %arg); 556 my $self = $class->SUPER::new (
557 children => [],
558 can_events => 0,
559 %arg,
560 );
401 $self->add ($_) for @$children; 561 $self->add ($_) for @$children;
402 562
403 $self 563 $self
404} 564}
405 565
406sub add { 566sub add {
407 my ($self, $child) = @_; 567 my ($self, @widgets) = @_;
408 568
409 $child->set_parent ($self); 569 $_->set_parent ($self)
570 for @widgets;
410 571
411 use sort 'stable'; 572 use sort 'stable';
412 573
413 $self->{children} = [ 574 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 575 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 576 @{$self->{children}}, @widgets
416 ]; 577 ];
417 578
418 $child->check_size; 579 $_->check_size
580 for @widgets;
581
582 $self->update;
583}
584
585sub children {
586 @{ $_[0]{children} }
419} 587}
420 588
421sub remove { 589sub remove {
422 my ($self, $child) = @_; 590 my ($self, $child) = @_;
423 591
424 delete $child->{parent}; 592 delete $child->{parent};
593 $child->hide;
425 594
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 596
428 $self->check_size; 597 $self->check_size;
598 $self->update;
599}
600
601sub clear {
602 my ($self) = @_;
603
604 my $children = delete $self->{children};
605 $self->{children} = [];
606
607 for (@$children) {
608 delete $_->{parent};
609 $_->hide;
610 }
611
612 $self->check_size;
613 $self->update;
429} 614}
430 615
431sub find_widget { 616sub find_widget {
432 my ($self, $x, $y) = @_; 617 my ($self, $x, $y) = @_;
433 618
… …
508} 693}
509 694
510sub update { 695sub update {
511 my ($self) = @_; 696 my ($self) = @_;
512 697
513 # we want to do this delayed... 698 $ROOT->on_refresh ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 699 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 700}
527 701
528sub size_allocate { 702sub size_allocate {
529 my ($self, $w, $h) = @_; 703 my ($self, $w, $h) = @_;
530 704
531 $self->child->configure (0, 0, $w, $h); 705 $self->SUPER::size_allocate ($w, $h);
706 $self->update;
707}
532 708
709sub _render {
710 $_[0]{children}[0]->draw;
711}
712
713sub render_child {
714 my ($self) = @_;
715
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT;
719
533 $self->render_chld; 720 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 };
534} 729}
535 730
536sub _draw { 731sub _draw {
537 my ($self) = @_; 732 my ($self) = @_;
538 733
… …
540 735
541 my $tex = $self->{texture} 736 my $tex = $self->{texture}
542 or return; 737 or return;
543 738
544 glEnable GL_BLEND; 739 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1;
548 744
549 $tex->draw_quad (0, 0, $w, $h); 745 $tex->draw_quad (0, 0, $w, $h);
550 746
551 glDisable GL_BLEND; 747 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 748 glDisable GL_TEXTURE_2D;
… …
556 752
557package CFClient::UI::ViewPort; 753package CFClient::UI::ViewPort;
558 754
559our @ISA = CFClient::UI::Window::; 755our @ISA = CFClient::UI::Window::;
560 756
561sub new { die }
562
563sub size_request { 757sub size_request {
564 my ($self) = @_; 758 my ($self) = @_;
565 759
566 @$self{qw(child_w child_h)} = $self->child->size_request; 760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
568 762
569 @$self{qw(child_w child_h)} 763 @$self{qw(child_w child_h)}
570} 764}
571 765
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate { 766sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_; 767 my ($self, $w, $h) = @_;
768
769 $self->update;
770}
771
772sub set_offset {
773 my ($self, $x, $y) = @_;
774
775 $self->{view_x} = int $x;
776 $self->{view_y} = int $y;
777
778 $self->update;
779}
780
781# hmm, this does not work for topleft of $self... but we should not aks for that
782sub _topleft {
783 my ($self, $x, $y) = @_;
784
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
786}
787
788sub find_widget {
789 my ($self, $x, $y) = @_;
790
791 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
792 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
793 ) {
794 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
795 } else {
796 $self->CFClient::UI::Base::find_widget ($x, $y)
599 797 }
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601} 798}
602 799
603sub _draw { 800sub _render {
604 my ($self) = @_; 801 my ($self) = @_;
605 802
606 my $chld = $self->child; 803 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
607 804
608 my ($w, $h) = $chld->size_request; 805 $self->SUPER::_render;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619} 806}
620 807
621############################################################################# 808#############################################################################
622 809
623package CFClient::UI::FancyFrame; 810package CFClient::UI::ScrolledWindow;
624 811
625our @ISA = CFClient::UI::Bin::; 812our @ISA = CFClient::UI::HBox::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 813
633sub new { 814sub new {
634 my $class = shift; 815 my $class = shift;
635 816
636 # TODO: user_x, user_y, overwrite moveto? 817 my $self;
818
819 my $slider = new CFClient::UI::Slider
820 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
824 },
825 ;
826
827 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort),
829 slider => $slider,
830 @_,
831 );
832
833 $self->{vp}->add ($self->{scrolled});
834 $self->add ($self->{vp});
835 $self->add ($self->{slider});
836
837 $self
838}
839
840#TODO# update range on size_allocate depeneing on child
841# update viewport offset on scroll
842
843#############################################################################
844
845package CFClient::UI::Frame;
846
847our @ISA = CFClient::UI::Bin::;
848
849use CFClient::OpenGL;
850
851sub new {
852 my $class = shift;
637 853
638 my $self = $class->SUPER::new ( 854 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 855 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 856 border_bg => [1, 1, 1, 1],
641 border => 0.8, 857 border => 0.8,
642 @_ 858 @_
643 ); 859 );
644 860
861 $self
862}
863
864sub _draw {
865 my ($self) = @_;
866
867 my ($w, $h) = ($self->{w}, $self->{h});
868
869 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D;
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873
874# glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0;
877# glVertex 0 , $h;
878# glVertex $w, $h;
879# glVertex $w, 0;
880# glEnd;
881
882
883 $self->child->draw;
884 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D;
886}
887
888#############################################################################
889
890package CFClient::UI::FancyFrame;
891
892our @ISA = CFClient::UI::Bin::;
893
894use CFClient::OpenGL;
895
896my @tex =
897 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
898 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
899
900sub new {
901 my $class = shift;
902
903 # TODO: user_x, user_y, overwrite moveto?
904
905 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1],
908 border => 0.6,
909 can_events => 1,
910 @_
911 );
912
645 $self->{title} &&= new CFClient::UI::Label 913 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 914 align => 0,
647 valign => 1, 915 valign => 1,
648 text => $self->{title}, 916 text => $self->{title},
649 fontsize => 1; 917 fontsize => $self->{border};
650 918
651 $self 919 $self
652} 920}
653 921
654sub border { 922sub border {
655 int $_[0]{border} * $::FONTSIZE 923 int $_[0]{border} * $::FONTSIZE
656} 924}
657 925
658sub size_request { 926sub size_request {
659 my ($self) = @_; 927 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 928
663 my ($w, $h) = $self->SUPER::size_request; 929 my ($w, $h) = $self->SUPER::size_request;
664 930
665 ( 931 (
666 $w + $self->border * 2, 932 $w + $self->border * 2,
… …
681} 947}
682 948
683sub button_down { 949sub button_down {
684 my ($self, $ev, $x, $y) = @_; 950 my ($self, $ev, $x, $y) = @_;
685 951
952 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 953 my $border = $self->border;
687 954
688 if ($x < $self->{w} && $x >= $self->{w} - $border 955 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 956 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 957
958 if ($lr & $td) {
959 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 960 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 961 my ($bw, $bh) = ($self->{w}, $self->{h});
693 962
963 my $mx = $x < $border;
964 my $my = $y < $border;
965
694 $self->{motion} = sub { 966 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 967 my ($ev, $x, $y) = @_;
696 968
697 ($x, $y) = ($ev->{x}, $ev->{y}); 969 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy;
698 971
699 $self->{user_w} = $bw + $x - $ox; 972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
701 $self->check_size; 975 $self->check_size;
702 }; 976 };
703 977
704 } elsif ($x >= 0 && $x < $self->{w} 978 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 979 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 980 my ($bx, $by) = ($self->{x}, $self->{y});
709 981
710 $self->{motion} = sub { 982 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 983 my ($ev, $x, $y) = @_;
… …
747 $tex[1]->draw_quad (0, 0, $w, $border); 1019 $tex[1]->draw_quad (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1020 $tex[3]->draw_quad (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1022 $tex[4]->draw_quad (0, $h - $border, $w, $border);
751 1023
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
752 my $bg = $tex[0]; 1025 my $bg = $tex[0];
753 1026
754 # TODO: repeat texture not scale 1027 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1028 my $rep_x = $cw / $bg->{w};
756 my $rep_y = $ch / $bg->{h}; 1029 my $rep_y = $ch / $bg->{h};
757 1030
758 glColor @{ $self->{bg} }; 1031 glColor @{ $self->{bg} };
759 1032
760 $bg->{s} = $rep_x; 1033 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y; 1034 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1; 1035 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1036 $bg->draw_quad ($border, $border, $cw, $ch);
764 1037
765 glDisable GL_TEXTURE_2D; 1038 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND; 1039 glDisable GL_BLEND;
1040 }
767 1041
768 $self->{title}->draw if $self->{title}; 1042 $self->{title}->draw if $self->{title};
1043
769 $self->child->draw; 1044 $self->child->draw;
770} 1045}
771 1046
772############################################################################# 1047#############################################################################
773 1048
… …
795 $self->{children}[$y][$x] = $child; 1070 $self->{children}[$y][$x] = $child;
796 1071
797 $child->check_size; 1072 $child->check_size;
798} 1073}
799 1074
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
800# TODO: move to container class maybe? send childs a signal on removal? 1079# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 1080sub clear {
802 my ($self) = @_; 1081 my ($self) = @_;
803 1082
1083 my @children = $self->children;
804 delete $self->{children}; 1084 delete $self->{children};
1085
1086 for (@children) {
1087 delete $_->{parent};
1088 $_->hide;
1089 }
1090
805 $self->update; 1091 $self->update;
806} 1092}
807 1093
808sub get_wh { 1094sub get_wh {
809 my ($self) = @_; 1095 my ($self) = @_;
… …
815 or next; 1101 or next;
816 1102
817 for my $x (0 .. $#$row) { 1103 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1104 my $widget = $row->[$x]
819 or next; 1105 or next;
820 my ($w, $h) = $widget->size_request; 1106 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1107
822 $w[$x] = max $w[$x], $w; 1108 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1109 $h[$y] = max $h[$y], $h;
824 } 1110 }
825 } 1111 }
… …
930 1216
931 ($h, $w) = ($w, $h); 1217 ($h, $w) = ($w, $h);
932 1218
933 my $children = $self->{children}; 1219 my $children = $self->{children};
934 1220
935 my @h = map +($_->size_request)[0], @$children; 1221 my @h = map $_->{req_w}, @$children;
936 1222
937 my $req_h = List::Util::sum @h; 1223 my $req_h = List::Util::sum @h;
938 1224
939 if ($req_h > $h) { 1225 if ($req_h > $h) {
940 # ah well, not enough space 1226 # ah well, not enough space
… …
988sub size_allocate { 1274sub size_allocate {
989 my ($self, $w, $h) = @_; 1275 my ($self, $w, $h) = @_;
990 1276
991 my $children = $self->{children}; 1277 my $children = $self->{children};
992 1278
993 my @h = map +($_->size_request)[1], @$children; 1279 my @h = map $_->{req_h}, @$children;
994 1280
995 my $req_h = List::Util::sum @h; 1281 my $req_h = List::Util::sum @h;
996 1282
997 if ($req_h > $h) { 1283 if ($req_h > $h) {
998 # ah well, not enough space 1284 # ah well, not enough space
… …
1032 1318
1033sub new { 1319sub new {
1034 my ($class, %arg) = @_; 1320 my ($class, %arg) = @_;
1035 1321
1036 my $self = $class->SUPER::new ( 1322 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1323 fg => [1, 1, 1],
1324 #font => default_font
1038 fontsize => 1, 1325 fontsize => 1,
1039 text => "", 1326 text => "",
1040 align => -1, 1327 align => -1,
1041 valign => -1, 1328 valign => -1,
1042 padding => 2, 1329 padding => 2,
1043 layout => new CFClient::Layout, 1330 layout => new CFClient::Layout,
1331 can_events => 0,
1044 %arg 1332 %arg
1045 ); 1333 );
1046 1334
1047 if (exists $self->{template}) { 1335 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1336 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1343
1056 $self 1344 $self
1057} 1345}
1058 1346
1059sub escape_text { 1347sub escape {
1060 local $_ = $_[1]; 1348 local $_ = $_[1];
1061 1349
1062 s/&/&amp;/g; 1350 s/&/&amp;/g;
1063 s/>/&gt;/g; 1351 s/>/&gt;/g;
1064 s/</&lt;/g; 1352 s/</&lt;/g;
1065 1353
1066 $_[1] 1354 $_[1]
1067} 1355}
1068 1356
1357sub update {
1358 my ($self) = @_;
1359
1360 delete $self->{texture};
1361 $self->SUPER::update;
1362}
1363
1069sub set_text { 1364sub set_text {
1070 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1071 1366
1367 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text";
1369
1072 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1073 1371
1074 delete $self->{texture}; 1372 delete $self->{texture};
1075 $self->update; 1373 $self->update;
1374 $self->check_size;
1076} 1375}
1077 1376
1078sub set_markup { 1377sub set_markup {
1079 my ($self, $markup) = @_; 1378 my ($self, $markup) = @_;
1080 1379
1380 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup";
1382
1081 $self->{layout}->set_markup ($markup); 1383 $self->{layout}->set_markup ($markup);
1082 1384
1083 delete $self->{texture}; 1385 delete $self->{texture};
1084 $self->update; 1386 $self->update;
1387 $self->check_size;
1085} 1388}
1086 1389
1087sub size_request { 1390sub size_request {
1088 my ($self) = @_; 1391 my ($self) = @_;
1089 1392
1090 $self->{layout}->set_width; 1393 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1396
1093 my ($w, $h) = $self->{layout}->size; 1397 my ($w, $h) = $self->{layout}->size;
1094 1398
1095 if (exists $self->{template}) { 1399 if (exists $self->{template}) {
1400 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1401 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1402
1098 my ($w2, $h2) = $self->{template}->size; 1403 my ($w2, $h2) = $self->{template}->size;
1099 1404
1100 $w = List::Util::max $w, $w2; 1405 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1416 my ($self, $w, $h) = @_;
1112 1417
1113 delete $self->{texture}; 1418 delete $self->{texture};
1114} 1419}
1115 1420
1421sub set_fontsize {
1422 my ($self, $fontsize) = @_;
1423
1424 $self->{fontsize} = $fontsize;
1425 delete $self->{texture};
1426
1427 $self->update;
1428 $self->check_size;
1429}
1430
1116sub _draw { 1431sub _draw {
1117 my ($self) = @_; 1432 my ($self) = @_;
1118 1433
1119 my $tex = $self->{texture} ||= do { 1434 my $tex = $self->{texture} ||= do {
1435 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1436 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1122 new_from_layout CFClient::Texture $self->{layout} 1438 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1439 };
1124 1440
… …
1157 1473
1158sub new { 1474sub new {
1159 my $class = shift; 1475 my $class = shift;
1160 1476
1161 $class->SUPER::new ( 1477 $class->SUPER::new (
1162 fg => [1, 1, 1], 1478 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1479 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1480 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1481 active_fg => [0, 0, 0],
1166 can_hover => 1, 1482 can_hover => 1,
1167 can_focus => 1, 1483 can_focus => 1,
1168 valign => 0, 1484 valign => 0,
1485 can_events => 1,
1169 @_ 1486 @_
1170 ) 1487 )
1171} 1488}
1172 1489
1173sub _set_text { 1490sub _set_text {
… …
1201} 1518}
1202 1519
1203sub size_allocate { 1520sub size_allocate {
1204 my ($self, $w, $h) = @_; 1521 my ($self, $w, $h) = @_;
1205 1522
1206 $self->_set_text ($self->{text}); 1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1524}
1208 1525
1209sub set_text { 1526sub set_text {
1210 my ($self, $text) = @_; 1527 my ($self, $text) = @_;
1211 1528
… …
1326 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1327 1644
1328 my $sym = $ev->{sym}; 1645 my $sym = $ev->{sym};
1329 1646
1330 if ($sym == 13) { 1647 if ($sym == 13) {
1648 unshift @{$self->{history}},
1649 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = '';
1331 $self->emit (activate => $self->get_text); 1652 $self->emit (activate => $txt);
1332 $self->update; 1653 $self->update;
1654
1655 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text;
1658 }
1659 if (@{$self->{history} || []} > 0) {
1660 $self->{history_pointer}++;
1661 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1662 $self->{history_pointer} = @{$self->{history} || []} - 1;
1663 }
1664 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1665 }
1666
1667 } elsif ($sym == CFClient::SDLK_DOWN) {
1668 $self->{history_pointer}--;
1669 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1670
1671 if ($self->{history_pointer} >= 0) {
1672 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1673 } else {
1674 $self->set_text ($self->{history_saveback});
1675 }
1333 1676
1334 } else { 1677 } else {
1335 $self->SUPER::key_down ($ev); 1678 $self->SUPER::key_down ($ev);
1336 } 1679 }
1337 1680
… …
1344our @ISA = CFClient::UI::Label::; 1687our @ISA = CFClient::UI::Label::;
1345 1688
1346use CFClient::OpenGL; 1689use CFClient::OpenGL;
1347 1690
1348my @tex = 1691my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1692 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1693 qw(b1_button_active.png);
1351 1694
1352sub new { 1695sub new {
1353 my $class = shift; 1696 my $class = shift;
1354 1697
1355 $class->SUPER::new ( 1698 $class->SUPER::new (
1356 padding => 4, 1699 padding => 4,
1357 fg => [1, 1, 1], 1700 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1701 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1702 active_fg => [0, 0, 1],
1360 can_hover => 1, 1703 can_hover => 1,
1361 align => 0, 1704 align => 0,
1362 valign => 0, 1705 valign => 0,
1706 can_events => 1,
1363 @_ 1707 @_
1364 ) 1708 )
1365} 1709}
1366 1710
1367sub button_up { 1711sub button_up {
… …
1401package CFClient::UI::CheckBox; 1745package CFClient::UI::CheckBox;
1402 1746
1403our @ISA = CFClient::UI::DrawBG::; 1747our @ISA = CFClient::UI::DrawBG::;
1404 1748
1405my @tex = 1749my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1750 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1751 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1752
1409use CFClient::OpenGL; 1753use CFClient::OpenGL;
1410 1754
1411sub new { 1755sub new {
… …
1460 glDisable GL_BLEND; 1804 glDisable GL_BLEND;
1461} 1805}
1462 1806
1463############################################################################# 1807#############################################################################
1464 1808
1809package CFClient::UI::Image;
1810
1811our @ISA = CFClient::UI::Base::;
1812
1813use CFClient::OpenGL;
1814use Carp qw/confess/;
1815
1816our %loaded_images;
1817
1818sub new {
1819 my $class = shift;
1820
1821 my $self = $class->SUPER::new (can_events => 0, @_);
1822
1823 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1824
1825 $loaded_images{$self->{image}} ||=
1826 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1827
1828 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1829
1830 Scalar::Util::weaken $loaded_images{$self->{image}};
1831
1832 $self->{aspect} = $tex->{w} / $tex->{h};
1833
1834 $self
1835}
1836
1837sub size_request {
1838 my ($self) = @_;
1839
1840 ($self->{tex}->{w}, $self->{tex}->{h})
1841}
1842
1843sub _draw {
1844 my ($self) = @_;
1845
1846 my $tex = $self->{tex};
1847
1848 my ($w, $h) = ($self->{w}, $self->{h});
1849
1850 if ($self->{rot90}) {
1851 glRotate 90, 0, 0, 1;
1852 glTranslate 0, -$self->{w}, 0;
1853
1854 ($w, $h) = ($h, $w);
1855 }
1856
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861
1862 $tex->draw_quad (0, 0, $w, $h);
1863
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D;
1866}
1867
1868#############################################################################
1869
1465package CFClient::UI::VGauge; 1870package CFClient::UI::VGauge;
1466 1871
1467our @ISA = CFClient::UI::Base::; 1872our @ISA = CFClient::UI::Base::;
1873
1874use List::Util qw(min max);
1468 1875
1469use CFClient::OpenGL; 1876use CFClient::OpenGL;
1470 1877
1471my %tex = ( 1878my %tex = (
1472 food => [ 1879 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1881 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1882 ],
1476 grace => [ 1883 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1885 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1886 ],
1480 hp => [ 1887 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1889 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1890 ],
1484 mana => [ 1891 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1892 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1893 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1894 ],
1488); 1895);
1489 1896
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1897# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1898sub new {
… …
1510} 1917}
1511 1918
1512sub set_max { 1919sub set_max {
1513 my ($self, $max) = @_; 1920 my ($self, $max) = @_;
1514 1921
1922 return if $self->{max_val} == $max;
1923
1515 $self->{max_val} = $max; 1924 $self->{max_val} = $max;
1925 $self->update;
1516} 1926}
1517 1927
1518sub set_value { 1928sub set_value {
1519 my ($self, $val, $max) = @_; 1929 my ($self, $val, $max) = @_;
1520 1930
1521 $self->set_max ($max) 1931 $self->set_max ($max)
1522 if defined $max; 1932 if defined $max;
1523 1933
1524 $max = $self->{max_val}; 1934 return if $self->{val} == $val;
1935
1525 $self->{val} = $val; 1936 $self->{val} = $val;
1526
1527 $self->update; 1937 $self->update;
1528} 1938}
1529 1939
1530sub _draw { 1940sub _draw {
1531 my ($self) = @_; 1941 my ($self) = @_;
1532 1942
1533 my $tex = $tex{$self->{type}}; 1943 my $tex = $tex{$self->{type}};
1944 my ($t1, $t2, $t3) = @$tex;
1534 1945
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1946 my ($w, $h) = ($self->{w}, $self->{h});
1536 1947
1537 if ($self->{vertical}) { 1948 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1; 1949 glRotate 90, 0, 0, 1;
… …
1540 1951
1541 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1542 } 1953 }
1543 1954
1544 my $ycut = $self->{val} / ($self->{max_val} || 1); 1955 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546 1956
1547 my $t1 = $tex->[0]; 1957 my $ycut1 = max 0, min 1, $ycut;
1548 my $t2 = $tex->[1]; 1958 my $ycut2 = max 0, min 1, $ycut - 1;
1959
1960 my $h1 = $self->{h} * (1 - $ycut1);
1961 my $h2 = $self->{h} * (1 - $ycut2);
1549 1962
1550 glEnable GL_BLEND; 1963 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1967
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1968 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS; 1969 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0; 1970 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1971 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1972 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1973 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd; 1974 glEnd;
1565 1975
1976 my $ycut1 = List::Util::min 1, $ycut;
1566 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1977 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS; 1978 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1979 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1980 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1981 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1982 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1572 glEnd; 1983 glEnd;
1984
1985 if ($t3) {
1986 glBindTexture GL_TEXTURE_2D, $t3->{name};
1987 glBegin GL_QUADS;
1988 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1989 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1990 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1991 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1992 glEnd;
1993 }
1573 1994
1574 glDisable GL_BLEND; 1995 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D; 1996 glDisable GL_TEXTURE_2D;
1576} 1997}
1577 1998
… …
1580package CFClient::UI::Gauge; 2001package CFClient::UI::Gauge;
1581 2002
1582our @ISA = CFClient::UI::VBox::; 2003our @ISA = CFClient::UI::VBox::;
1583 2004
1584sub new { 2005sub new {
1585 my ($class, %arg) = shift; 2006 my ($class, %arg) = @_;
1586 2007
1587 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1588 @_, 2009 tooltip => $arg{type},
2010 can_hover => 1,
2011 can_events => 1,
2012 %arg,
1589 ); 2013 );
1590 2014
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2015 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2016 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2017 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1594 2018
1595 $self 2019 $self
2020}
2021
2022sub set_fontsize {
2023 my ($self, $fsize) = @_;
2024
2025 $self->{value}->set_fontsize ($fsize);
2026 $self->{max} ->set_fontsize ($fsize);
2027}
2028
2029sub set_max {
2030 my ($self, $max) = @_;
2031
2032 $self->{gauge}->set_max ($max);
2033 $self->{max}->set_text ($max);
1596} 2034}
1597 2035
1598sub set_value { 2036sub set_value {
1599 my ($self, $val, $max) = @_; 2037 my ($self, $val, $max) = @_;
1600 2038
1601 $self->set_max ($max) 2039 $self->set_max ($max)
1602 if defined $max; 2040 if defined $max;
1603 2041
1604 $self->{gauge}->set_value ($val, $max); 2042 $self->{gauge}->set_value ($val, $max);
1605 $self->{value}->set_text ($val); 2043 $self->{value}->set_text ($val);
1606}
1607
1608sub set_max {
1609 my ($self, $max) = @_;
1610
1611 $self->{gauge}->set_max ($max);
1612 $self->{max}->set_text ($max);
1613} 2044}
1614 2045
1615############################################################################# 2046#############################################################################
1616 2047
1617package CFClient::UI::Slider; 2048package CFClient::UI::Slider;
… …
1636 # TODO: calculations are off 2067 # TODO: calculations are off
1637 my $self = $class->SUPER::new ( 2068 my $self = $class->SUPER::new (
1638 fg => [1, 1, 1], 2069 fg => [1, 1, 1],
1639 active_fg => [0, 0, 0], 2070 active_fg => [0, 0, 0],
1640 range => [0, 0, 100, 10], 2071 range => [0, 0, 100, 10],
1641 req_w => 20, 2072 req_w => $::WIDTH / 80,
1642 req_h => 20, 2073 req_h => $::WIDTH / 80,
1643 vertical => 0, 2074 vertical => 0,
1644 can_hover => 1, 2075 can_hover => 1,
1645 inner_pad => 5, 2076 inner_pad => 5,
1646 @_ 2077 @_
1647 ); 2078 );
… …
1757 2188
1758sub new { 2189sub new {
1759 my $class = shift; 2190 my $class = shift;
1760 2191
1761 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1762 fontsize => 1, 2193 fontsize => 1,
2194 can_events => 0,
2195 #font => default_font
1763 @_, 2196 @_,
1764 2197
1765 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout),
1766 par => [], 2199 par => [],
1767 height => 0, 2200 height => 0,
1768 children => [ 2201 children => [
1769 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
1770 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
1771 ], 2204 ],
1772 ); 2205 );
1773 2206
1774 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
1775 $self->update;
1776 });
1777 2208
1778 $self 2209 $self
1779} 2210}
1780 2211
1781sub set_fontsize { 2212sub set_fontsize {
… …
1789 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
1790 2221
1791 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
1792 2223
1793 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1794 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
1795 $layout->set_text ($text); 2226 $layout->set_text ($text);
1796 2227
1797 ($layout->size)[1] 2228 ($layout->size)[1]
1798} 2229}
1799 2230
… …
1807sub size_allocate { 2238sub size_allocate {
1808 my ($self, $w, $h) = @_; 2239 my ($self, $w, $h) = @_;
1809 2240
1810 $self->SUPER::size_allocate ($w, $h); 2241 $self->SUPER::size_allocate ($w, $h);
1811 2242
2243 $self->{layout}->set_font ($self->{font}) if $self->{font};
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w}); 2245 $self->{layout}->set_width ($self->{children}[0]{w});
1814 2246
1815 $self->reflow; 2247 $self->reflow;
1816} 2248}
… …
1851 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1852 2284
1853 delete $self->{texture}; 2285 delete $self->{texture};
1854 } 2286 }
1855 2287
1856 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1857 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
1858 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
1859 2291
1860 glEnable GL_BLEND; 2292 glEnable GL_BLEND;
1861 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1862 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
… …
1869 2301
1870 my $y = 0; 2302 my $y = 0;
1871 2303
1872 my $layout = $self->{layout}; 2304 my $layout = $self->{layout};
1873 2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307
1874 for my $par (@{$self->{par}}) { 2308 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0]; 2309 my $h = $par->[0];
1876 2310
1877 if ($y0 < $y + $h && $y < $y1) { 2311 if ($y0 < $y + $h && $y < $y1) {
1878 $layout->set_text ($par->[2]); 2312 $layout->set_text ($par->[2]);
… …
1892} 2326}
1893 2327
1894sub _draw { 2328sub _draw {
1895 my ($self) = @_; 2329 my ($self) = @_;
1896 2330
1897 if ($self->{texture}) { 2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1898 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
1899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1;
1900 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1901 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
1902 } 2338 glDisable GL_BLEND;
1903 2339
1904 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
1905 2341
1906} 2342}
1907 2343
… …
1955 2391
1956sub new { 2392sub new {
1957 my $class = shift; 2393 my $class = shift;
1958 2394
1959 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
1960 state => 0, 2396 state => 0,
1961 connect_activate => \&toggle_flopper, 2397 connect_activate => \&toggle_flopper,
1962 @_ 2398 @_
1963 ); 2399 );
1964 2400
1965 if ($self->{state}) { 2401 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2422 $self->emit (changed => $self->{state});
1987} 2423}
1988 2424
1989############################################################################# 2425#############################################################################
1990 2426
2427package CFClient::UI::Tooltip;
2428
2429our @ISA = CFClient::UI::Bin::;
2430
2431use CFClient::OpenGL;
2432
2433sub new {
2434 my $class = shift;
2435
2436 $class->SUPER::new (
2437 @_,
2438 can_events => 0,
2439 )
2440}
2441
2442sub set_markup {
2443 my ($self, $text) = @_;
2444
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2446 $self->{label}->set_markup ($text);
2447 $self->add ($self->{label});
2448}
2449
2450sub size_request {
2451 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456
2457 ($w + 4, $h + 4)
2458}
2459
2460sub size_allocate {
2461 my ($self, $w, $h) = @_;
2462
2463 $self->SUPER::size_allocate ($w - 4, $h - 4);
2464}
2465
2466sub _draw {
2467 my ($self) = @_;
2468
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375;
2471
2472 my ($w, $h) = @$self{qw(w h)};
2473
2474 glColor 1, 0.8, 0.4;
2475 glBegin GL_QUADS;
2476 glVertex 0 , 0;
2477 glVertex 0 , $h;
2478 glVertex $w, $h;
2479 glVertex $w, 0;
2480 glEnd;
2481
2482 glColor 0, 0, 0;
2483 glBegin GL_LINE_LOOP;
2484 glVertex 0 , 0;
2485 glVertex 0 , $h;
2486 glVertex $w, $h;
2487 glVertex $w, 0;
2488 glEnd;
2489
2490 glPopMatrix;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw;
2494}
2495
2496#############################################################################
2497
2498package CFClient::UI::Face;
2499
2500our @ISA = CFClient::UI::Base::;
2501
2502use CFClient::OpenGL;
2503
2504sub new {
2505 my $class = shift;
2506
2507 $class->SUPER::new (
2508 aspect => 1,
2509 @_,
2510 )
2511}
2512
2513sub size_request {
2514 (32, 8)
2515}
2516
2517sub _draw {
2518 my ($self) = @_;
2519
2520 return unless $::CONN;#d# manage and cache textures differently
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2522
2523 # TODO animation
2524 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 }
2534}
2535
2536#############################################################################
2537
2538package CFClient::UI::InventoryItem;
2539
2540our @ISA = CFClient::UI::HBox::;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new (
2555 can_hover => 1,
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_,
2610 );
2611
2612 $self
2613}
2614
2615sub set_items {
2616 my ($self, $items) = @_;
2617
2618 $self->{scrolled}->clear;
2619 return unless $items;
2620
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2622
2623 $self->{real_items} = \@items;
2624
2625 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2631 }
2632
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h});
2639}
2640
2641#############################################################################
2642
2643package CFClient::UI::Menu;
2644
2645our @ISA = CFClient::UI::FancyFrame::;
2646
2647use CFClient::OpenGL;
2648
2649sub new {
2650 my $class = shift;
2651
2652 my $self = $class->SUPER::new (
2653 items => [],
2654 z => 100,
2655 @_,
2656 );
2657
2658 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2659
2660 for my $item (@{ $self->{items} }) {
2661 my ($widget, $cb) = @$item;
2662
2663 # handle various types of items, only text for now
2664 if (!ref $widget) {
2665 $widget = new CFClient::UI::Label
2666 can_hover => 1,
2667 can_events => 1,
2668 text => $widget;
2669 }
2670
2671 $self->{item}{$widget} = $item;
2672
2673 $self->{vbox}->add ($widget);
2674 }
2675
2676 $self
2677}
2678
2679# popup given the event (must be a mouse button down event currently)
2680sub popup {
2681 my ($self, $ev) = @_;
2682
2683 $self->emit ("popdown");
2684
2685 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self;
2687 $self->{button} = $ev->{button};
2688
2689 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691}
2692
2693sub mouse_motion {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # TODO: should use vbox->find_widget or so
2697 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2698 $self->{hover} = $self->{item}{$HOVER};
2699}
2700
2701sub button_up {
2702 my ($self, $ev, $x, $y) = @_;
2703
2704 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB;
2706 $self->hide;
2707
2708 $self->emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover};
2710 }
2711}
2712
2713#############################################################################
2714
1991package CFClient::UI::Root; 2715package CFClient::UI::Root;
1992 2716
1993our @ISA = CFClient::UI::Container::; 2717our @ISA = CFClient::UI::Container::;
1994 2718
1995use CFClient::OpenGL; 2719use CFClient::OpenGL;
1996 2720
1997sub check_size { 2721sub check_size {
1998 my ($self) = @_; 2722 my ($self) = @_;
1999 2723
2000 $self->configure (0, 0, $::WITH, $::HEIGHT); 2724 $self->configure (0, 0, $self->{w}, $self->{h});
2001} 2725}
2002 2726
2003sub size_request { 2727sub size_request {
2004 ($::WIDTH, $::HEIGHT) 2728 my ($self) = @_;
2729
2730 ($self->{w}, $self->{h})
2731}
2732
2733sub size_allocate {
2734 my ($self, $w, $h) = @_;
2735
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2005} 2754}
2006 2755
2007sub configure { 2756sub configure {
2008 my ($self, $x, $y, $w, $h) = @_; 2757 my ($self, $x, $y, $w, $h) = @_;
2009 2758
2010 $self->SUPER::configure ($x, $y, $w, $h); 2759 $self->SUPER::configure ($x, $y, $w, $h);
2011 2760
2012 $_->configure ($_->{x}, $_->{y}, $_->size_request) 2761 for my $child ($self->children) {
2013 for @{$self->{children}}; 2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2766 $child->configure ($X, $Y, $W, $H);
2767 }
2014} 2768}
2015 2769
2016sub _topleft { 2770sub _topleft {
2017 my ($self, $x, $y) = @_; 2771 my ($self, $x, $y) = @_;
2018 2772
… …
2026 ::refresh (); 2780 ::refresh ();
2027} 2781}
2028 2782
2029sub add { 2783sub add {
2030 my ($self, $child) = @_; 2784 my ($self, $child) = @_;
2785
2786 # integerize window positions
2787 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y};
2031 2789
2032 $self->SUPER::add ($child); 2790 $self->SUPER::add ($child);
2033} 2791}
2034 2792
2035sub on_refresh { 2793sub on_refresh {
… …
2061############################################################################# 2819#############################################################################
2062 2820
2063package CFClient::UI; 2821package CFClient::UI;
2064 2822
2065$ROOT = new CFClient::UI::Root; 2823$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip;
2066 2825
20671 28261
2068 2827

Diff Legend

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