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.188 by root, Mon May 8 21:16:09 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is 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->{parent}
409 or return 1;
300 410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 416 $self->{req_w} = $w;
303 $self->{req_h} = $h; 417 $self->{req_h} = $h;
304 418
305 $self->{parent}->check_size 419 $self->{parent}->check_size
306 if $self->{parent}; 420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
307 } 428 }
308} 429}
309 430
310sub update { 431sub update {
311 my ($self) = @_; 432 my ($self) = @_;
… …
321} 442}
322 443
323sub emit { 444sub emit {
324 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
325 446
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 448}
330 449
331sub DESTROY { 450sub DESTROY {
332 my ($self) = @_; 451 my ($self) = @_;
333 452
… …
378 497
379package CFClient::UI::Empty; 498package CFClient::UI::Empty;
380 499
381our @ISA = CFClient::UI::Base::; 500our @ISA = CFClient::UI::Base::;
382 501
502sub new {
503 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg);
505}
506
383sub size_request { 507sub size_request {
384 (0, 0) 508 (0, 0)
385} 509}
386 510
387sub draw { } 511sub draw { }
… …
395sub new { 519sub new {
396 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
397 521
398 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
399 523
400 my $self = $class->SUPER::new (children => [], %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
401 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
402 530
403 $self 531 $self
404} 532}
405 533
406sub add { 534sub add {
407 my ($self, $child) = @_; 535 my ($self, @widgets) = @_;
408 536
409 $child->set_parent ($self); 537 $_->set_parent ($self)
538 for @widgets;
410 539
411 use sort 'stable'; 540 use sort 'stable';
412 541
413 $self->{children} = [ 542 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 543 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 544 @{$self->{children}}, @widgets
416 ]; 545 ];
417 546
418 $child->check_size; 547 $_->check_size
548 for @widgets;
549
550 $self->update;
551}
552
553sub children {
554 @{ $_[0]{children} }
419} 555}
420 556
421sub remove { 557sub remove {
422 my ($self, $child) = @_; 558 my ($self, $child) = @_;
423 559
424 delete $child->{parent}; 560 delete $child->{parent};
561 $child->hide;
425 562
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 564
428 $self->check_size; 565 $self->check_size;
566 $self->update;
567}
568
569sub clear {
570 my ($self) = @_;
571
572 my $children = delete $self->{children};
573 $self->{children} = [];
574
575 for (@$children) {
576 delete $_->{parent};
577 $_->hide;
578 }
579
580 $self->check_size;
581 $self->update;
429} 582}
430 583
431sub find_widget { 584sub find_widget {
432 my ($self, $x, $y) = @_; 585 my ($self, $x, $y) = @_;
433 586
… …
508} 661}
509 662
510sub update { 663sub update {
511 my ($self) = @_; 664 my ($self) = @_;
512 665
513 # we want to do this delayed... 666 $ROOT->on_refresh ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 667 $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} 668}
527 669
528sub size_allocate { 670sub size_allocate {
529 my ($self, $w, $h) = @_; 671 my ($self, $w, $h) = @_;
530 672
531 $self->child->configure (0, 0, $w, $h); 673 $self->SUPER::size_allocate ($w, $h);
674 $self->update;
675}
532 676
677sub _render {
678 $_[0]{children}[0]->draw;
679}
680
681sub render_child {
682 my ($self) = @_;
683
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT;
687
533 $self->render_chld; 688 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 };
534} 697}
535 698
536sub _draw { 699sub _draw {
537 my ($self) = @_; 700 my ($self) = @_;
538 701
… …
540 703
541 my $tex = $self->{texture} 704 my $tex = $self->{texture}
542 or return; 705 or return;
543 706
544 glEnable GL_BLEND; 707 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1;
548 712
549 $tex->draw_quad (0, 0, $w, $h); 713 $tex->draw_quad (0, 0, $w, $h);
550 714
551 glDisable GL_BLEND; 715 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 716 glDisable GL_TEXTURE_2D;
… …
556 720
557package CFClient::UI::ViewPort; 721package CFClient::UI::ViewPort;
558 722
559our @ISA = CFClient::UI::Window::; 723our @ISA = CFClient::UI::Window::;
560 724
561sub new { die }
562
563sub size_request { 725sub size_request {
564 my ($self) = @_; 726 my ($self) = @_;
565 727
566 @$self{qw(child_w child_h)} = $self->child->size_request; 728 @$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)}); 729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
568 730
569 @$self{qw(child_w child_h)} 731 @$self{qw(child_w child_h)}
570} 732}
571 733
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 { 734sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_; 735 my ($self, $w, $h) = @_;
736
737 $self->update;
738}
739
740sub set_offset {
741 my ($self, $x, $y) = @_;
742
743 $self->{view_x} = int $x;
744 $self->{view_y} = int $y;
745
746 $self->update;
747}
748
749# hmm, this does not work for topleft of $self... but we should not aks for that
750sub _topleft {
751 my ($self, $x, $y) = @_;
752
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
754}
755
756sub find_widget {
757 my ($self, $x, $y) = @_;
758
759 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
760 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
761 ) {
762 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
763 } else {
764 $self->CFClient::UI::Base::find_widget ($x, $y)
599 765 }
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601} 766}
602 767
603sub _draw { 768sub _render {
604 my ($self) = @_; 769 my ($self) = @_;
605 770
606 my $chld = $self->child; 771 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
607 772
608 my ($w, $h) = $chld->size_request; 773 $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} 774}
620 775
621############################################################################# 776#############################################################################
622 777
623package CFClient::UI::FancyFrame; 778package CFClient::UI::ScrolledWindow;
624 779
625our @ISA = CFClient::UI::Bin::; 780our @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 781
633sub new { 782sub new {
634 my $class = shift; 783 my $class = shift;
635 784
636 # TODO: user_x, user_y, overwrite moveto? 785 my $self;
786
787 my $slider = new CFClient::UI::Slider
788 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
792 },
793 ;
794
795 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort),
797 slider => $slider,
798 @_,
799 );
800
801 $self->{vp}->add ($self->{scrolled});
802 $self->add ($self->{vp});
803 $self->add ($self->{slider});
804
805 $self
806}
807
808#TODO# update range on size_allocate depeneing on child
809# update viewport offset on scroll
810
811#############################################################################
812
813package CFClient::UI::Frame;
814
815our @ISA = CFClient::UI::Bin::;
816
817use CFClient::OpenGL;
818
819sub new {
820 my $class = shift;
637 821
638 my $self = $class->SUPER::new ( 822 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 823 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 824 border_bg => [1, 1, 1, 1],
641 border => 0.8, 825 border => 0.8,
642 @_ 826 @_
643 ); 827 );
644 828
829 $self
830}
831
832sub _draw {
833 my ($self) = @_;
834
835 my ($w, $h) = ($self->{w}, $self->{h});
836
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841
842# glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0;
845# glVertex 0 , $h;
846# glVertex $w, $h;
847# glVertex $w, 0;
848# glEnd;
849
850
851 $self->child->draw;
852 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D;
854}
855
856#############################################################################
857
858package CFClient::UI::FancyFrame;
859
860our @ISA = CFClient::UI::Bin::;
861
862use CFClient::OpenGL;
863
864my @tex =
865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
866 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
867
868sub new {
869 my $class = shift;
870
871 # TODO: user_x, user_y, overwrite moveto?
872
873 my $self = $class->SUPER::new (
874 bg => [1, 1, 1, 1],
875 border_bg => [1, 1, 1, 1],
876 border => 0.6,
877 can_events => 1,
878 @_
879 );
880
645 $self->{title} &&= new CFClient::UI::Label 881 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 882 align => 0,
647 valign => 1, 883 valign => 1,
648 text => $self->{title}, 884 text => $self->{title},
649 fontsize => 1; 885 fontsize => $self->{border};
650 886
651 $self 887 $self
652} 888}
653 889
654sub border { 890sub border {
655 int $_[0]{border} * $::FONTSIZE 891 int $_[0]{border} * $::FONTSIZE
656} 892}
657 893
658sub size_request { 894sub size_request {
659 my ($self) = @_; 895 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 896
663 my ($w, $h) = $self->SUPER::size_request; 897 my ($w, $h) = $self->SUPER::size_request;
664 898
665 ( 899 (
666 $w + $self->border * 2, 900 $w + $self->border * 2,
… …
681} 915}
682 916
683sub button_down { 917sub button_down {
684 my ($self, $ev, $x, $y) = @_; 918 my ($self, $ev, $x, $y) = @_;
685 919
920 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 921 my $border = $self->border;
687 922
688 if ($x < $self->{w} && $x >= $self->{w} - $border 923 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 924 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 925
926 if ($lr & $td) {
927 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 928 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 929 my ($bw, $bh) = ($self->{w}, $self->{h});
693 930
931 my $mx = $x < $border;
932 my $my = $y < $border;
933
694 $self->{motion} = sub { 934 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 935 my ($ev, $x, $y) = @_;
696 936
697 ($x, $y) = ($ev->{x}, $ev->{y}); 937 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy;
698 939
699 $self->{user_w} = $bw + $x - $ox; 940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
701 $self->check_size; 943 $self->check_size;
702 }; 944 };
703 945
704 } elsif ($x >= 0 && $x < $self->{w} 946 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 947 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 948 my ($bx, $by) = ($self->{x}, $self->{y});
709 949
710 $self->{motion} = sub { 950 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 951 my ($ev, $x, $y) = @_;
… …
747 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad (0, $h - $border, $w, $border);
751 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
752 my $bg = $tex[0]; 993 my $bg = $tex[0];
753 994
754 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
756 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
757 998
758 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
759 1000
760 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad ($border, $border, $cw, $ch);
764 1005
765 glDisable GL_TEXTURE_2D; 1006 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
1008 }
767 1009
768 $self->{title}->draw if $self->{title}; 1010 $self->{title}->draw if $self->{title};
1011
769 $self->child->draw; 1012 $self->child->draw;
770} 1013}
771 1014
772############################################################################# 1015#############################################################################
773 1016
… …
795 $self->{children}[$y][$x] = $child; 1038 $self->{children}[$y][$x] = $child;
796 1039
797 $child->check_size; 1040 $child->check_size;
798} 1041}
799 1042
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
800# TODO: move to container class maybe? send childs a signal on removal? 1047# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 1048sub clear {
802 my ($self) = @_; 1049 my ($self) = @_;
803 1050
1051 my @children = $self->children;
804 delete $self->{children}; 1052 delete $self->{children};
1053
1054 for (@children) {
1055 delete $_->{parent};
1056 $_->hide;
1057 }
1058
805 $self->update; 1059 $self->update;
806} 1060}
807 1061
808sub get_wh { 1062sub get_wh {
809 my ($self) = @_; 1063 my ($self) = @_;
… …
815 or next; 1069 or next;
816 1070
817 for my $x (0 .. $#$row) { 1071 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1072 my $widget = $row->[$x]
819 or next; 1073 or next;
820 my ($w, $h) = $widget->size_request; 1074 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1075
822 $w[$x] = max $w[$x], $w; 1076 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1077 $h[$y] = max $h[$y], $h;
824 } 1078 }
825 } 1079 }
… …
930 1184
931 ($h, $w) = ($w, $h); 1185 ($h, $w) = ($w, $h);
932 1186
933 my $children = $self->{children}; 1187 my $children = $self->{children};
934 1188
935 my @h = map +($_->size_request)[0], @$children; 1189 my @h = map $_->{req_w}, @$children;
936 1190
937 my $req_h = List::Util::sum @h; 1191 my $req_h = List::Util::sum @h;
938 1192
939 if ($req_h > $h) { 1193 if ($req_h > $h) {
940 # ah well, not enough space 1194 # ah well, not enough space
… …
988sub size_allocate { 1242sub size_allocate {
989 my ($self, $w, $h) = @_; 1243 my ($self, $w, $h) = @_;
990 1244
991 my $children = $self->{children}; 1245 my $children = $self->{children};
992 1246
993 my @h = map +($_->size_request)[1], @$children; 1247 my @h = map $_->{req_h}, @$children;
994 1248
995 my $req_h = List::Util::sum @h; 1249 my $req_h = List::Util::sum @h;
996 1250
997 if ($req_h > $h) { 1251 if ($req_h > $h) {
998 # ah well, not enough space 1252 # ah well, not enough space
… …
1032 1286
1033sub new { 1287sub new {
1034 my ($class, %arg) = @_; 1288 my ($class, %arg) = @_;
1035 1289
1036 my $self = $class->SUPER::new ( 1290 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1291 fg => [1, 1, 1],
1292 #font => default_font
1038 fontsize => 1, 1293 fontsize => 1,
1039 text => "", 1294 text => "",
1040 align => -1, 1295 align => -1,
1041 valign => -1, 1296 valign => -1,
1042 padding => 2, 1297 padding => 2,
1043 layout => new CFClient::Layout, 1298 layout => new CFClient::Layout,
1299 can_events => 0,
1044 %arg 1300 %arg
1045 ); 1301 );
1046 1302
1047 if (exists $self->{template}) { 1303 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1304 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1311
1056 $self 1312 $self
1057} 1313}
1058 1314
1059sub escape_text { 1315sub escape {
1060 local $_ = $_[1]; 1316 local $_ = $_[1];
1061 1317
1062 s/&/&amp;/g; 1318 s/&/&amp;/g;
1063 s/>/&gt;/g; 1319 s/>/&gt;/g;
1064 s/</&lt;/g; 1320 s/</&lt;/g;
1065 1321
1066 $_[1] 1322 $_[1]
1067} 1323}
1068 1324
1325sub update {
1326 my ($self) = @_;
1327
1328 delete $self->{texture};
1329 $self->SUPER::update;
1330}
1331
1069sub set_text { 1332sub set_text {
1070 my ($self, $text) = @_; 1333 my ($self, $text) = @_;
1071 1334
1335 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text";
1337
1072 $self->{layout}->set_text ($text); 1338 $self->{layout}->set_text ($text);
1073 1339
1074 delete $self->{texture}; 1340 delete $self->{texture};
1075 $self->update; 1341 $self->update;
1342 $self->check_size;
1076} 1343}
1077 1344
1078sub set_markup { 1345sub set_markup {
1079 my ($self, $markup) = @_; 1346 my ($self, $markup) = @_;
1080 1347
1348 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup";
1350
1081 $self->{layout}->set_markup ($markup); 1351 $self->{layout}->set_markup ($markup);
1082 1352
1083 delete $self->{texture}; 1353 delete $self->{texture};
1084 $self->update; 1354 $self->update;
1355 $self->check_size;
1085} 1356}
1086 1357
1087sub size_request { 1358sub size_request {
1088 my ($self) = @_; 1359 my ($self) = @_;
1089 1360
1090 $self->{layout}->set_width; 1361 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1364
1093 my ($w, $h) = $self->{layout}->size; 1365 my ($w, $h) = $self->{layout}->size;
1094 1366
1095 if (exists $self->{template}) { 1367 if (exists $self->{template}) {
1368 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1369 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1370
1098 my ($w2, $h2) = $self->{template}->size; 1371 my ($w2, $h2) = $self->{template}->size;
1099 1372
1100 $w = List::Util::max $w, $w2; 1373 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1384 my ($self, $w, $h) = @_;
1112 1385
1113 delete $self->{texture}; 1386 delete $self->{texture};
1114} 1387}
1115 1388
1389sub set_fontsize {
1390 my ($self, $fontsize) = @_;
1391
1392 $self->{fontsize} = $fontsize;
1393 delete $self->{texture};
1394
1395 $self->update;
1396 $self->check_size;
1397}
1398
1116sub _draw { 1399sub _draw {
1117 my ($self) = @_; 1400 my ($self) = @_;
1118 1401
1119 my $tex = $self->{texture} ||= do { 1402 my $tex = $self->{texture} ||= do {
1403 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1404 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1122 new_from_layout CFClient::Texture $self->{layout} 1406 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1407 };
1124 1408
… …
1157 1441
1158sub new { 1442sub new {
1159 my $class = shift; 1443 my $class = shift;
1160 1444
1161 $class->SUPER::new ( 1445 $class->SUPER::new (
1162 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1166 can_hover => 1, 1450 can_hover => 1,
1167 can_focus => 1, 1451 can_focus => 1,
1168 valign => 0, 1452 valign => 0,
1453 can_events => 1,
1169 @_ 1454 @_
1170 ) 1455 )
1171} 1456}
1172 1457
1173sub _set_text { 1458sub _set_text {
… …
1201} 1486}
1202 1487
1203sub size_allocate { 1488sub size_allocate {
1204 my ($self, $w, $h) = @_; 1489 my ($self, $w, $h) = @_;
1205 1490
1206 $self->_set_text ($self->{text}); 1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1492}
1208 1493
1209sub set_text { 1494sub set_text {
1210 my ($self, $text) = @_; 1495 my ($self, $text) = @_;
1211 1496
… …
1326 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1327 1612
1328 my $sym = $ev->{sym}; 1613 my $sym = $ev->{sym};
1329 1614
1330 if ($sym == 13) { 1615 if ($sym == 13) {
1616 unshift @{$self->{history}},
1617 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = '';
1331 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1332 $self->update; 1621 $self->update;
1622
1623 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text;
1626 }
1627 if (@{$self->{history} || []} > 0) {
1628 $self->{history_pointer}++;
1629 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1630 $self->{history_pointer} = @{$self->{history} || []} - 1;
1631 }
1632 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1633 }
1634
1635 } elsif ($sym == CFClient::SDLK_DOWN) {
1636 $self->{history_pointer}--;
1637 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1638
1639 if ($self->{history_pointer} >= 0) {
1640 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1641 } else {
1642 $self->set_text ($self->{history_saveback});
1643 }
1333 1644
1334 } else { 1645 } else {
1335 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1336 } 1647 }
1337 1648
… …
1344our @ISA = CFClient::UI::Label::; 1655our @ISA = CFClient::UI::Label::;
1345 1656
1346use CFClient::OpenGL; 1657use CFClient::OpenGL;
1347 1658
1348my @tex = 1659my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1660 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1661 qw(b1_button_active.png);
1351 1662
1352sub new { 1663sub new {
1353 my $class = shift; 1664 my $class = shift;
1354 1665
1355 $class->SUPER::new ( 1666 $class->SUPER::new (
1356 padding => 4, 1667 padding => 4,
1357 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1670 active_fg => [0, 0, 1],
1360 can_hover => 1, 1671 can_hover => 1,
1361 align => 0, 1672 align => 0,
1362 valign => 0, 1673 valign => 0,
1674 can_events => 1,
1363 @_ 1675 @_
1364 ) 1676 )
1365} 1677}
1366 1678
1367sub button_up { 1679sub button_up {
… …
1401package CFClient::UI::CheckBox; 1713package CFClient::UI::CheckBox;
1402 1714
1403our @ISA = CFClient::UI::DrawBG::; 1715our @ISA = CFClient::UI::DrawBG::;
1404 1716
1405my @tex = 1717my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1719 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1720
1409use CFClient::OpenGL; 1721use CFClient::OpenGL;
1410 1722
1411sub new { 1723sub new {
… …
1460 glDisable GL_BLEND; 1772 glDisable GL_BLEND;
1461} 1773}
1462 1774
1463############################################################################# 1775#############################################################################
1464 1776
1777package CFClient::UI::Image;
1778
1779our @ISA = CFClient::UI::Base::;
1780
1781use CFClient::OpenGL;
1782use Carp qw/confess/;
1783
1784our %loaded_images;
1785
1786sub new {
1787 my $class = shift;
1788
1789 my $self = $class->SUPER::new (can_events => 0, @_);
1790
1791 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1792
1793 $loaded_images{$self->{image}} ||=
1794 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1795
1796 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1797
1798 Scalar::Util::weaken $loaded_images{$self->{image}};
1799
1800 $self->{aspect} = $tex->{w} / $tex->{h};
1801
1802 $self
1803}
1804
1805sub size_request {
1806 my ($self) = @_;
1807
1808 ($self->{tex}->{w}, $self->{tex}->{h})
1809}
1810
1811sub _draw {
1812 my ($self) = @_;
1813
1814 my $tex = $self->{tex};
1815
1816 my ($w, $h) = ($self->{w}, $self->{h});
1817
1818 if ($self->{rot90}) {
1819 glRotate 90, 0, 0, 1;
1820 glTranslate 0, -$self->{w}, 0;
1821
1822 ($w, $h) = ($h, $w);
1823 }
1824
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829
1830 $tex->draw_quad (0, 0, $w, $h);
1831
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D;
1834}
1835
1836#############################################################################
1837
1465package CFClient::UI::VGauge; 1838package CFClient::UI::VGauge;
1466 1839
1467our @ISA = CFClient::UI::Base::; 1840our @ISA = CFClient::UI::Base::;
1841
1842use List::Util qw(min max);
1468 1843
1469use CFClient::OpenGL; 1844use CFClient::OpenGL;
1470 1845
1471my %tex = ( 1846my %tex = (
1472 food => [ 1847 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1849 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1850 ],
1476 grace => [ 1851 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1852 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1853 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1854 ],
1480 hp => [ 1855 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1856 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1857 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1858 ],
1484 mana => [ 1859 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1860 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1861 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1862 ],
1488); 1863);
1489 1864
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1865# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1866sub new {
… …
1510} 1885}
1511 1886
1512sub set_max { 1887sub set_max {
1513 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1514 1889
1890 return if $self->{max_val} == $max;
1891
1515 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1516} 1894}
1517 1895
1518sub set_value { 1896sub set_value {
1519 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1520 1898
1521 $self->set_max ($max) 1899 $self->set_max ($max)
1522 if defined $max; 1900 if defined $max;
1523 1901
1524 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1525 $self->{val} = $val; 1904 $self->{val} = $val;
1526
1527 $self->update; 1905 $self->update;
1528} 1906}
1529 1907
1530sub _draw { 1908sub _draw {
1531 my ($self) = @_; 1909 my ($self) = @_;
1532 1910
1533 my $tex = $tex{$self->{type}}; 1911 my $tex = $tex{$self->{type}};
1912 my ($t1, $t2, $t3) = @$tex;
1534 1913
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1914 my ($w, $h) = ($self->{w}, $self->{h});
1536 1915
1537 if ($self->{vertical}) { 1916 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1; 1917 glRotate 90, 0, 0, 1;
… …
1540 1919
1541 ($w, $h) = ($h, $w); 1920 ($w, $h) = ($h, $w);
1542 } 1921 }
1543 1922
1544 my $ycut = $self->{val} / ($self->{max_val} || 1); 1923 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546 1924
1547 my $t1 = $tex->[0]; 1925 my $ycut1 = max 0, min 1, $ycut;
1548 my $t2 = $tex->[1]; 1926 my $ycut2 = max 0, min 1, $ycut - 1;
1927
1928 my $h1 = $self->{h} * (1 - $ycut1);
1929 my $h2 = $self->{h} * (1 - $ycut2);
1549 1930
1550 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D; 1933 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1935
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1936 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS; 1937 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0; 1938 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1939 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1940 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1941 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd; 1942 glEnd;
1565 1943
1944 my $ycut1 = List::Util::min 1, $ycut;
1566 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1945 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS; 1946 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1947 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1948 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1949 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1950 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1572 glEnd; 1951 glEnd;
1952
1953 if ($t3) {
1954 glBindTexture GL_TEXTURE_2D, $t3->{name};
1955 glBegin GL_QUADS;
1956 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1957 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1958 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1959 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1960 glEnd;
1961 }
1573 1962
1574 glDisable GL_BLEND; 1963 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D; 1964 glDisable GL_TEXTURE_2D;
1576} 1965}
1577 1966
… …
1580package CFClient::UI::Gauge; 1969package CFClient::UI::Gauge;
1581 1970
1582our @ISA = CFClient::UI::VBox::; 1971our @ISA = CFClient::UI::VBox::;
1583 1972
1584sub new { 1973sub new {
1585 my ($class, %arg) = shift; 1974 my ($class, %arg) = @_;
1586 1975
1587 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1588 @_, 1977 tooltip => $arg{type},
1978 can_hover => 1,
1979 can_events => 1,
1980 %arg,
1589 ); 1981 );
1590 1982
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1983 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1984 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1985 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1594 1986
1595 $self 1987 $self
1988}
1989
1990sub set_fontsize {
1991 my ($self, $fsize) = @_;
1992
1993 $self->{value}->set_fontsize ($fsize);
1994 $self->{max} ->set_fontsize ($fsize);
1995}
1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
1596} 2002}
1597 2003
1598sub set_value { 2004sub set_value {
1599 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1600 2006
1601 $self->set_max ($max) 2007 $self->set_max ($max)
1602 if defined $max; 2008 if defined $max;
1603 2009
1604 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1605 $self->{value}->set_text ($val); 2011 $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} 2012}
1614 2013
1615############################################################################# 2014#############################################################################
1616 2015
1617package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1636 # TODO: calculations are off 2035 # TODO: calculations are off
1637 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1638 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1639 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1640 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1641 req_w => 20, 2040 req_w => $::WIDTH / 80,
1642 req_h => 20, 2041 req_h => $::WIDTH / 80,
1643 vertical => 0, 2042 vertical => 0,
1644 can_hover => 1, 2043 can_hover => 1,
1645 inner_pad => 5, 2044 inner_pad => 5,
1646 @_ 2045 @_
1647 ); 2046 );
… …
1757 2156
1758sub new { 2157sub new {
1759 my $class = shift; 2158 my $class = shift;
1760 2159
1761 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1762 fontsize => 1, 2161 fontsize => 1,
2162 can_events => 0,
2163 #font => default_font
1763 @_, 2164 @_,
1764 2165
1765 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1766 par => [], 2167 par => [],
1767 height => 0, 2168 height => 0,
1768 children => [ 2169 children => [
1769 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1770 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1771 ], 2172 ],
1772 ); 2173 );
1773 2174
1774 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1775 $self->update;
1776 });
1777 2176
1778 $self 2177 $self
1779} 2178}
1780 2179
1781sub set_fontsize { 2180sub set_fontsize {
… …
1789 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1790 2189
1791 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1792 2191
1793 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1794 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1795 $layout->set_text ($text); 2194 $layout->set_text ($text);
1796 2195
1797 ($layout->size)[1] 2196 ($layout->size)[1]
1798} 2197}
1799 2198
… …
1807sub size_allocate { 2206sub size_allocate {
1808 my ($self, $w, $h) = @_; 2207 my ($self, $w, $h) = @_;
1809 2208
1810 $self->SUPER::size_allocate ($w, $h); 2209 $self->SUPER::size_allocate ($w, $h);
1811 2210
2211 $self->{layout}->set_font ($self->{font}) if $self->{font};
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2212 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w}); 2213 $self->{layout}->set_width ($self->{children}[0]{w});
1814 2214
1815 $self->reflow; 2215 $self->reflow;
1816} 2216}
… …
1851 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1852 2252
1853 delete $self->{texture}; 2253 delete $self->{texture};
1854 } 2254 }
1855 2255
1856 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1857 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
1858 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
1859 2259
1860 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
1861 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1862 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
1869 2269
1870 my $y = 0; 2270 my $y = 0;
1871 2271
1872 my $layout = $self->{layout}; 2272 my $layout = $self->{layout};
1873 2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275
1874 for my $par (@{$self->{par}}) { 2276 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0]; 2277 my $h = $par->[0];
1876 2278
1877 if ($y0 < $y + $h && $y < $y1) { 2279 if ($y0 < $y + $h && $y < $y1) {
1878 $layout->set_text ($par->[2]); 2280 $layout->set_text ($par->[2]);
… …
1892} 2294}
1893 2295
1894sub _draw { 2296sub _draw {
1895 my ($self) = @_; 2297 my ($self) = @_;
1896 2298
1897 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1898 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
1899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1;
1900 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1901 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
1902 } 2306 glDisable GL_BLEND;
1903 2307
1904 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
1905 2309
1906} 2310}
1907 2311
… …
1955 2359
1956sub new { 2360sub new {
1957 my $class = shift; 2361 my $class = shift;
1958 2362
1959 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
1960 state => 0, 2364 state => 0,
1961 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
1962 @_ 2366 @_
1963 ); 2367 );
1964 2368
1965 if ($self->{state}) { 2369 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2390 $self->emit (changed => $self->{state});
1987} 2391}
1988 2392
1989############################################################################# 2393#############################################################################
1990 2394
2395package CFClient::UI::Tooltip;
2396
2397our @ISA = CFClient::UI::Bin::;
2398
2399use CFClient::OpenGL;
2400
2401sub new {
2402 my $class = shift;
2403
2404 $class->SUPER::new (
2405 @_,
2406 can_events => 0,
2407 )
2408}
2409
2410sub set_markup {
2411 my ($self, $text) = @_;
2412
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2414 $self->{label}->set_markup ($text);
2415 $self->add ($self->{label});
2416}
2417
2418sub size_request {
2419 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424
2425 ($w + 4, $h + 4)
2426}
2427
2428sub size_allocate {
2429 my ($self, $w, $h) = @_;
2430
2431 $self->SUPER::size_allocate ($w - 4, $h - 4);
2432}
2433
2434sub _draw {
2435 my ($self) = @_;
2436
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375;
2439
2440 my ($w, $h) = @$self{qw(w h)};
2441
2442 glColor 1, 0.8, 0.4;
2443 glBegin GL_QUADS;
2444 glVertex 0 , 0;
2445 glVertex 0 , $h;
2446 glVertex $w, $h;
2447 glVertex $w, 0;
2448 glEnd;
2449
2450 glColor 0, 0, 0;
2451 glBegin GL_LINE_LOOP;
2452 glVertex 0 , 0;
2453 glVertex 0 , $h;
2454 glVertex $w, $h;
2455 glVertex $w, 0;
2456 glEnd;
2457
2458 glPopMatrix;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package CFClient::UI::Face;
2467
2468our @ISA = CFClient::UI::Base::;
2469
2470use CFClient::OpenGL;
2471
2472sub new {
2473 my $class = shift;
2474
2475 $class->SUPER::new (
2476 aspect => 1,
2477 @_,
2478 )
2479}
2480
2481sub size_request {
2482 (32, 8)
2483}
2484
2485sub _draw {
2486 my ($self) = @_;
2487
2488 return unless $::CONN;#d# manage and cache textures differently
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2490
2491 # TODO animation
2492 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 }
2502}
2503
2504#############################################################################
2505
2506package CFClient::UI::InventoryItem;
2507
2508our @ISA = CFClient::UI::HBox::;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new (
2523 can_hover => 1,
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_,
2578 );
2579
2580 $self
2581}
2582
2583sub set_items {
2584 my ($self, $items) = @_;
2585
2586 $self->{scrolled}->clear;
2587 return unless $items;
2588
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2590
2591 $self->{real_items} = \@items;
2592
2593 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2599 }
2600
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602}
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607}
2608
2609#############################################################################
2610
2611package CFClient::UI::Menu;
2612
2613our @ISA = CFClient::UI::FancyFrame::;
2614
2615use CFClient::OpenGL;
2616
2617sub new {
2618 my $class = shift;
2619
2620 my $self = $class->SUPER::new (
2621 items => [],
2622 z => 100,
2623 @_,
2624 );
2625
2626 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2627
2628 for my $item (@{ $self->{items} }) {
2629 my ($widget, $cb) = @$item;
2630
2631 # handle various types of items, only text for now
2632 if (!ref $widget) {
2633 $widget = new CFClient::UI::Label
2634 can_hover => 1,
2635 can_events => 1,
2636 text => $widget;
2637 }
2638
2639 $self->{item}{$widget} = $item;
2640
2641 $self->{vbox}->add ($widget);
2642 }
2643
2644 $self
2645}
2646
2647# popup given the event (must be a mouse button down event currently)
2648sub popup {
2649 my ($self, $ev) = @_;
2650
2651 $self->emit ("popdown");
2652
2653 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self;
2655 $self->{button} = $ev->{button};
2656
2657 $self->show;
2658 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2659}
2660
2661sub mouse_motion {
2662 my ($self, $ev, $x, $y) = @_;
2663
2664 # TODO: should use vbox->find_widget or so
2665 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2666 $self->{hover} = $self->{item}{$HOVER};
2667}
2668
2669sub button_up {
2670 my ($self, $ev, $x, $y) = @_;
2671
2672 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB;
2674 $self->hide;
2675
2676 $self->emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover};
2678 }
2679}
2680
2681#############################################################################
2682
1991package CFClient::UI::Root; 2683package CFClient::UI::Root;
1992 2684
1993our @ISA = CFClient::UI::Container::; 2685our @ISA = CFClient::UI::Container::;
1994 2686
1995use CFClient::OpenGL; 2687use CFClient::OpenGL;
1996 2688
1997sub check_size { 2689sub check_size {
1998 my ($self) = @_; 2690 my ($self) = @_;
1999 2691
2000 $self->configure (0, 0, $::WITH, $::HEIGHT); 2692 $self->configure (0, 0, $self->{w}, $self->{h});
2001} 2693}
2002 2694
2003sub size_request { 2695sub size_request {
2004 ($::WIDTH, $::HEIGHT) 2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2699}
2700
2701sub size_allocate {
2702 my ($self, $w, $h) = @_;
2703
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2005} 2722}
2006 2723
2007sub configure { 2724sub configure {
2008 my ($self, $x, $y, $w, $h) = @_; 2725 my ($self, $x, $y, $w, $h) = @_;
2009 2726
2010 $self->SUPER::configure ($x, $y, $w, $h); 2727 $self->SUPER::configure ($x, $y, $w, $h);
2011 2728
2012 $_->configure ($_->{x}, $_->{y}, $_->size_request) 2729 for my $child ($self->children) {
2013 for @{$self->{children}}; 2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731
2732 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2734 $child->configure ($X, $Y, $W, $H);
2735 }
2014} 2736}
2015 2737
2016sub _topleft { 2738sub _topleft {
2017 my ($self, $x, $y) = @_; 2739 my ($self, $x, $y) = @_;
2018 2740
… …
2026 ::refresh (); 2748 ::refresh ();
2027} 2749}
2028 2750
2029sub add { 2751sub add {
2030 my ($self, $child) = @_; 2752 my ($self, $child) = @_;
2753
2754 # integerize window positions
2755 $child->{x} = int $child->{x};
2756 $child->{y} = int $child->{y};
2031 2757
2032 $self->SUPER::add ($child); 2758 $self->SUPER::add ($child);
2033} 2759}
2034 2760
2035sub on_refresh { 2761sub on_refresh {
… …
2061############################################################################# 2787#############################################################################
2062 2788
2063package CFClient::UI; 2789package CFClient::UI;
2064 2790
2065$ROOT = new CFClient::UI::Root; 2791$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip;
2066 2793
20671 27941
2068 2795

Diff Legend

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