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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
165 $self->{y} = $y; 232 $self->{y} = $y;
166 $self->update; 233 $self->update;
167 } 234 }
168 235
169 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
170 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
171 $self->{h} = $h;
172
173 $self->size_allocate ($w, $h);
174 $self->update;
175 } 238 }
176} 239}
177 240
178sub size_allocate { 241sub size_allocate {
179 # nothing to be done 242 # nothing to be done
180} 243}
181 244
182# return top left coordinates 245sub children {
183sub _topleft { 246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
260sub set_max_size {
184 my ($self, $x, $y) = @_; 261 my ($self, $w, $h) = @_;
185 262
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h;
187} 265}
188 266
189# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
190sub coord2local { 268sub coord2local {
191 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
192 270
193 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 272}
196 273
197# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
198sub coord2global { 275sub coord2global {
199 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
200 277
201 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 279}
204 280
205sub focus_in { 281sub focus_in {
206 my ($self) = @_; 282 my ($self) = @_;
207 283
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 343 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 344 glVertex $x , $y + $self->{h};
269 glEnd; 345 glEnd;
270 glDisable GL_BLEND; 346 glDisable GL_BLEND;
271 } 347 }
348
349 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix;
351 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0;
355 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h};
358 glEnd;
359 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 }
272} 362}
273 363
274sub _draw { 364sub _draw {
275 my ($self) = @_; 365 my ($self) = @_;
276 366
277 warn "no draw defined for $self\n"; 367 warn "no draw defined for $self\n";
278} 368}
279 369
280sub find_widget { 370sub find_widget {
281 my ($self, $x, $y) = @_; 371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
282 374
283 return $self 375 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 378
… …
288} 380}
289 381
290sub set_parent { 382sub set_parent {
291 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
292 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
293 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
294} 387}
295 388
296sub check_size { 389sub check_size {
297 my ($self) = @_; 390 my ($self) = @_;
298 391
299 my ($w, $h) = $self->size_request; 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
300
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308} 393}
309 394
310sub update { 395sub update {
311 my ($self) = @_; 396 my ($self) = @_;
312 397
… …
321} 406}
322 407
323sub emit { 408sub emit {
324 my ($self, $signal, @args) = @_; 409 my ($self, $signal, @args) = @_;
325 410
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 412}
330 413
331sub DESTROY { 414sub DESTROY {
332 my ($self) = @_; 415 my ($self) = @_;
333 416
… …
378 461
379package CFClient::UI::Empty; 462package CFClient::UI::Empty;
380 463
381our @ISA = CFClient::UI::Base::; 464our @ISA = CFClient::UI::Base::;
382 465
466sub new {
467 my ($class, %arg) = @_;
468 $class->SUPER::new (can_events => 0, %arg);
469}
470
383sub size_request { 471sub size_request {
384 (0, 0) 472 (0, 0)
385} 473}
386 474
387sub draw { } 475sub draw { }
… …
395sub new { 483sub new {
396 my ($class, %arg) = @_; 484 my ($class, %arg) = @_;
397 485
398 my $children = delete $arg{children} || []; 486 my $children = delete $arg{children} || [];
399 487
400 my $self = $class->SUPER::new (children => [], %arg); 488 my $self = $class->SUPER::new (
489 children => [],
490 can_events => 0,
491 %arg,
492 );
401 $self->add ($_) for @$children; 493 $self->add ($_) for @$children;
402 494
403 $self 495 $self
404} 496}
405 497
406sub add { 498sub add {
407 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
408 500
409 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
410 503
411 use sort 'stable'; 504 use sort 'stable';
412 505
413 $self->{children} = [ 506 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
416 ]; 509 ];
417 510
418 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
419} 519}
420 520
421sub remove { 521sub remove {
422 my ($self, $child) = @_; 522 my ($self, $child) = @_;
423 523
424 delete $child->{parent}; 524 delete $child->{parent};
525 $child->hide;
425 526
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 528
428 $self->check_size; 529 $self->check_size;
530 $self->update;
531}
532
533sub clear {
534 my ($self) = @_;
535
536 my $children = delete $self->{children};
537 $self->{children} = [];
538
539 for (@$children) {
540 delete $_->{parent};
541 $_->hide;
542 }
543
544 $self->check_size;
545 $self->update;
429} 546}
430 547
431sub find_widget { 548sub find_widget {
432 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
433 550
… …
508} 625}
509 626
510sub update { 627sub update {
511 my ($self) = @_; 628 my ($self) = @_;
512 629
513 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 631 $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} 632}
527 633
528sub size_allocate { 634sub size_allocate {
529 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
530 636
531 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
532 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
645sub render_child {
646 my ($self) = @_;
647
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT;
651
533 $self->render_chld; 652 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 };
534} 661}
535 662
536sub _draw { 663sub _draw {
537 my ($self) = @_; 664 my ($self) = @_;
538 665
… …
540 667
541 my $tex = $self->{texture} 668 my $tex = $self->{texture}
542 or return; 669 or return;
543 670
544 glEnable GL_BLEND; 671 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1;
548 676
549 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
550 678
551 glDisable GL_BLEND; 679 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
556 684
557package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
558 686
559our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
560 688
561sub new { die }
562
563sub size_request { 689sub size_request {
564 my ($self) = @_; 690 my ($self) = @_;
565 691
566 @$self{qw(child_w child_h)} = $self->child->size_request; 692 @$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)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
568 694
569 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
570} 696}
571 697
572sub _draw { 698sub size_allocate {
573 my ($self) = @_; 699 my ($self, $w, $h) = @_;
574 700
575 $self->{children}[1]->draw; 701 $self->update;
576} 702}
577 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
706
707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
751package CFClient::UI::ScrolledWindow;
752
753our @ISA = CFClient::UI::HBox::;
754
755sub new {
756 my $class = shift;
757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort),
770 slider => $slider,
771 @_,
772 );
773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
578 783
579############################################################################# 784#############################################################################
580 785
581package CFClient::UI::Frame; 786package CFClient::UI::Frame;
582 787
… …
593 border => 0.8, 798 border => 0.8,
594 @_ 799 @_
595 ); 800 );
596 801
597 $self 802 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605}
606
607sub size_request {
608 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h})
610}
611
612sub size_allocate {
613 my ($self, $w, $h) = @_;
614 $self->{w} = $w;
615 $self->{h} = $h;
616 $self->child->configure (0, 0, $w, $h);
617} 803}
618 804
619sub _draw { 805sub _draw {
620 my ($self) = @_; 806 my ($self) = @_;
621 807
… …
656 my $class = shift; 842 my $class = shift;
657 843
658 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
659 845
660 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
663 border => 0.8, 849 border => 0.6,
850 can_events => 1,
664 @_ 851 @_
665 ); 852 );
666 853
667 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 855 align => 0,
669 valign => 1, 856 valign => 1,
670 text => $self->{title}, 857 text => $self->{title},
671 fontsize => 1; 858 fontsize => $self->{border};
672 859
673 $self 860 $self
674} 861}
675 862
676sub border { 863sub border {
677 int $_[0]{border} * $::FONTSIZE 864 int $_[0]{border} * $::FONTSIZE
678} 865}
679 866
680sub size_request { 867sub size_request {
681 my ($self) = @_; 868 my ($self) = @_;
682
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684 869
685 my ($w, $h) = $self->SUPER::size_request; 870 my ($w, $h) = $self->SUPER::size_request;
686 871
687 ( 872 (
688 $w + $self->border * 2, 873 $w + $self->border * 2,
… …
703} 888}
704 889
705sub button_down { 890sub button_down {
706 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
707 892
893 my ($w, $h) = @$self{qw(w h)};
708 my $border = $self->border; 894 my $border = $self->border;
709 895
710 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
713 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
714 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
715 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
716 $self->{motion} = sub { 907 $self->{motion} = sub {
717 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
718 909
719 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
720 912
721 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
722 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
723 $self->check_size; 916 $self->check_size;
724 }; 917 };
725 918
726 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
727 && $y >= 0 && $y < $border) {
728
729 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
730 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
731 922
732 $self->{motion} = sub { 923 $self->{motion} = sub {
733 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
769 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
770 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
771 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
772 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
773 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
774 my $bg = $tex[0]; 966 my $bg = $tex[0];
775 967
776 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
777 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
778 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
779 971
780 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
781 973
782 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
783 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
784 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
785 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
786 978
787 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
788 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
789 982
790 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
791 $self->child->draw; 985 $self->child->draw;
792} 986}
793 987
794############################################################################# 988#############################################################################
795 989
… …
817 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
818 1012
819 $child->check_size; 1013 $child->check_size;
820} 1014}
821 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
822# TODO: move to container class maybe? send childs a signal on removal? 1020# TODO: move to container class maybe? send childs a signal on removal?
823sub clear { 1021sub clear {
824 my ($self) = @_; 1022 my ($self) = @_;
825 1023
1024 my @children = $self->children;
826 delete $self->{children}; 1025 delete $self->{children};
1026
1027 for (@children) {
1028 delete $_->{parent};
1029 $_->hide;
1030 }
1031
827 $self->update; 1032 $self->update;
828} 1033}
829 1034
830sub get_wh { 1035sub get_wh {
831 my ($self) = @_; 1036 my ($self) = @_;
… …
837 or next; 1042 or next;
838 1043
839 for my $x (0 .. $#$row) { 1044 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 1045 my $widget = $row->[$x]
841 or next; 1046 or next;
842 my ($w, $h) = $widget->size_request; 1047 my ($w, $h) = @$widget{qw(req_w req_h)};
843 1048
844 $w[$x] = max $w[$x], $w; 1049 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 1050 $h[$y] = max $h[$y], $h;
846 } 1051 }
847 } 1052 }
… …
952 1157
953 ($h, $w) = ($w, $h); 1158 ($h, $w) = ($w, $h);
954 1159
955 my $children = $self->{children}; 1160 my $children = $self->{children};
956 1161
957 my @h = map +($_->size_request)[0], @$children; 1162 my @h = map $_->{req_w}, @$children;
958 1163
959 my $req_h = List::Util::sum @h; 1164 my $req_h = List::Util::sum @h;
960 1165
961 if ($req_h > $h) { 1166 if ($req_h > $h) {
962 # ah well, not enough space 1167 # ah well, not enough space
… …
1010sub size_allocate { 1215sub size_allocate {
1011 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1012 1217
1013 my $children = $self->{children}; 1218 my $children = $self->{children};
1014 1219
1015 my @h = map +($_->size_request)[1], @$children; 1220 my @h = map $_->{req_h}, @$children;
1016 1221
1017 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
1018 1223
1019 if ($req_h > $h) { 1224 if ($req_h > $h) {
1020 # ah well, not enough space 1225 # ah well, not enough space
… …
1054 1259
1055sub new { 1260sub new {
1056 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1057 1262
1058 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1265 #font => default_font
1060 fontsize => 1, 1266 fontsize => 1,
1061 text => "", 1267 text => "",
1062 align => -1, 1268 align => -1,
1063 valign => -1, 1269 valign => -1,
1064 padding => 2, 1270 padding => 2,
1065 layout => new CFClient::Layout, 1271 layout => new CFClient::Layout,
1272 can_events => 0,
1066 %arg 1273 %arg
1067 ); 1274 );
1068 1275
1069 if (exists $self->{template}) { 1276 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1277 my $layout = new CFClient::Layout;
… …
1076 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1077 1284
1078 $self 1285 $self
1079} 1286}
1080 1287
1081sub escape_text { 1288sub escape {
1082 local $_ = $_[1]; 1289 local $_ = $_[1];
1083 1290
1084 s/&/&amp;/g; 1291 s/&/&amp;/g;
1085 s/>/&gt;/g; 1292 s/>/&gt;/g;
1086 s/</&lt;/g; 1293 s/</&lt;/g;
1087 1294
1088 $_[1] 1295 $_[1]
1089} 1296}
1090 1297
1298sub update {
1299 my ($self) = @_;
1300
1301 delete $self->{texture};
1302 $self->SUPER::update;
1303}
1304
1091sub set_text { 1305sub set_text {
1092 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1093 1307
1308 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text";
1310
1094 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1095 1312
1096 delete $self->{texture};
1097 $self->update; 1313 $self->update;
1314 $self->check_size;
1098} 1315}
1099 1316
1100sub set_markup { 1317sub set_markup {
1101 my ($self, $markup) = @_; 1318 my ($self, $markup) = @_;
1102 1319
1320 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup";
1322
1103 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1104 1324
1105 delete $self->{texture};
1106 $self->update; 1325 $self->update;
1326 $self->check_size;
1107} 1327}
1108 1328
1109sub size_request { 1329sub size_request {
1110 my ($self) = @_; 1330 my ($self) = @_;
1111 1331
1112 $self->{layout}->set_width; 1332 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1);
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1335
1115 my ($w, $h) = $self->{layout}->size; 1336 my ($w, $h) = $self->{layout}->size;
1116 1337
1117 if (exists $self->{template}) { 1338 if (exists $self->{template}) {
1339 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1340 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1341
1120 my ($w2, $h2) = $self->{template}->size; 1342 my ($w2, $h2) = $self->{template}->size;
1121 1343
1122 $w = List::Util::max $w, $w2; 1344 $w = List::Util::max $w, $w2;
… …
1137 1359
1138sub set_fontsize { 1360sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1140 1362
1141 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1364 delete $self->{texture};
1365
1366 $self->update;
1142 $self->check_size; 1367 $self->check_size;
1143} 1368}
1144 1369
1145sub _draw { 1370sub _draw {
1146 my ($self) = @_; 1371 my ($self) = @_;
1147 1372
1148 my $tex = $self->{texture} ||= do { 1373 my $tex = $self->{texture} ||= do {
1374 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $self->{layout}->set_width ($self->{w}); 1375 $self->{layout}->set_width ($self->{w});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1151 new_from_layout CFClient::Texture $self->{layout} 1377 new_from_layout CFClient::Texture $self->{layout}
1152 }; 1378 };
1153 1379
… …
1186 1412
1187sub new { 1413sub new {
1188 my $class = shift; 1414 my $class = shift;
1189 1415
1190 $class->SUPER::new ( 1416 $class->SUPER::new (
1191 fg => [1, 1, 1], 1417 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1418 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1419 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1420 active_fg => [0, 0, 0],
1195 can_hover => 1, 1421 can_hover => 1,
1196 can_focus => 1, 1422 can_focus => 1,
1197 valign => 0, 1423 valign => 0,
1424 can_events => 1,
1198 @_ 1425 @_
1199 ) 1426 )
1200} 1427}
1201 1428
1202sub _set_text { 1429sub _set_text {
… …
1230} 1457}
1231 1458
1232sub size_allocate { 1459sub size_allocate {
1233 my ($self, $w, $h) = @_; 1460 my ($self, $w, $h) = @_;
1234 1461
1235 $self->_set_text ($self->{text}); 1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236} 1463}
1237 1464
1238sub set_text { 1465sub set_text {
1239 my ($self, $text) = @_; 1466 my ($self, $text) = @_;
1240 1467
… …
1355 my ($self, $ev) = @_; 1582 my ($self, $ev) = @_;
1356 1583
1357 my $sym = $ev->{sym}; 1584 my $sym = $ev->{sym};
1358 1585
1359 if ($sym == 13) { 1586 if ($sym == 13) {
1587 unshift @{$self->{history}},
1588 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1591 $self->emit (activate => $txt);
1361 $self->update; 1592 $self->update;
1593
1594 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text;
1597 }
1598 if (@{$self->{history} || []} > 0) {
1599 $self->{history_pointer}++;
1600 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1601 $self->{history_pointer} = @{$self->{history} || []} - 1;
1602 }
1603 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1604 }
1605
1606 } elsif ($sym == CFClient::SDLK_DOWN) {
1607 $self->{history_pointer}--;
1608 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1609
1610 if ($self->{history_pointer} >= 0) {
1611 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1612 } else {
1613 $self->set_text ($self->{history_saveback});
1614 }
1362 1615
1363 } else { 1616 } else {
1364 $self->SUPER::key_down ($ev); 1617 $self->SUPER::key_down ($ev);
1365 } 1618 }
1366 1619
… …
1380 1633
1381sub new { 1634sub new {
1382 my $class = shift; 1635 my $class = shift;
1383 1636
1384 $class->SUPER::new ( 1637 $class->SUPER::new (
1385 padding => 4, 1638 padding => 4,
1386 fg => [1, 1, 1], 1639 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2], 1640 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1641 active_fg => [0, 0, 1],
1389 can_hover => 1, 1642 can_hover => 1,
1390 align => 0, 1643 align => 0,
1391 valign => 0, 1644 valign => 0,
1645 can_events => 1,
1392 @_ 1646 @_
1393 ) 1647 )
1394} 1648}
1395 1649
1396sub button_up { 1650sub button_up {
… …
1501our %loaded_images; 1755our %loaded_images;
1502 1756
1503sub new { 1757sub new {
1504 my $class = shift; 1758 my $class = shift;
1505 1759
1506 my $self = $class->SUPER::new (@_); 1760 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1761
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1762 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1763
1510 $loaded_images{$self->{image}} ||= 1764 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1765 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1553############################################################################# 1807#############################################################################
1554 1808
1555package CFClient::UI::VGauge; 1809package CFClient::UI::VGauge;
1556 1810
1557our @ISA = CFClient::UI::Base::; 1811our @ISA = CFClient::UI::Base::;
1812
1813use List::Util qw(min max);
1558 1814
1559use CFClient::OpenGL; 1815use CFClient::OpenGL;
1560 1816
1561my %tex = ( 1817my %tex = (
1562 food => [ 1818 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1820 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1821 ],
1566 grace => [ 1822 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1824 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1825 ],
1570 hp => [ 1826 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1827 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1828 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1829 ],
1574 mana => [ 1830 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1831 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1832 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1833 ],
1578); 1834);
1579 1835
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 1836# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 1837sub new {
… …
1600} 1856}
1601 1857
1602sub set_max { 1858sub set_max {
1603 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1604 1860
1861 return if $self->{max_val} == $max;
1862
1605 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1606} 1865}
1607 1866
1608sub set_value { 1867sub set_value {
1609 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1610 1869
1611 $self->set_max ($max) 1870 $self->set_max ($max)
1612 if defined $max; 1871 if defined $max;
1613 1872
1614 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1615 $self->{val} = $val; 1875 $self->{val} = $val;
1616
1617 $self->update; 1876 $self->update;
1618} 1877}
1619 1878
1620sub _draw { 1879sub _draw {
1621 my ($self) = @_; 1880 my ($self) = @_;
1622 1881
1623 my $tex = $tex{$self->{type}}; 1882 my $tex = $tex{$self->{type}};
1883 my ($t1, $t2, $t3) = @$tex;
1624 1884
1625 my ($w, $h) = ($self->{w}, $self->{h}); 1885 my ($w, $h) = ($self->{w}, $self->{h});
1626 1886
1627 if ($self->{vertical}) { 1887 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 1888 glRotate 90, 0, 0, 1;
… …
1630 1890
1631 ($w, $h) = ($h, $w); 1891 ($w, $h) = ($h, $w);
1632 } 1892 }
1633 1893
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 1894 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 1895
1637 my $t1 = $tex->[0]; 1896 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 1897 my $ycut2 = max 0, min 1, $ycut - 1;
1898
1899 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2);
1639 1901
1640 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 1904 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 1906
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1907 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 1908 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 1909 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1910 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1911 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1912 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 1913 glEnd;
1655 1914
1915 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1916 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 1917 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1918 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1919 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1920 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1921 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 1922 glEnd;
1923
1924 if ($t3) {
1925 glBindTexture GL_TEXTURE_2D, $t3->{name};
1926 glBegin GL_QUADS;
1927 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1928 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1929 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1930 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1931 glEnd;
1932 }
1663 1933
1664 glDisable GL_BLEND; 1934 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 1935 glDisable GL_TEXTURE_2D;
1666} 1936}
1667 1937
… …
1670package CFClient::UI::Gauge; 1940package CFClient::UI::Gauge;
1671 1941
1672our @ISA = CFClient::UI::VBox::; 1942our @ISA = CFClient::UI::VBox::;
1673 1943
1674sub new { 1944sub new {
1675 my ($class, %arg) = shift; 1945 my ($class, %arg) = @_;
1676 1946
1677 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1678 @_, 1948 tooltip => $arg{type},
1949 can_hover => 1,
1950 can_events => 1,
1951 %arg,
1679 ); 1952 );
1680 1953
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1956 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 1957
1685 $self 1958 $self
1686} 1959}
1687 1960
1688sub set_fontsize { 1961sub set_fontsize {
… …
1690 1963
1691 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1693} 1966}
1694 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1695sub set_value { 1975sub set_value {
1696 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1697 1977
1698 $self->set_max ($max) 1978 $self->set_max ($max)
1699 if defined $max; 1979 if defined $max;
1700 1980
1701 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 1982 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 1983}
1711 1984
1712############################################################################# 1985#############################################################################
1713 1986
1714package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1733 # TODO: calculations are off 2006 # TODO: calculations are off
1734 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1735 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1736 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1737 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1738 req_w => 20, 2011 req_w => $::WIDTH / 80,
1739 req_h => 20, 2012 req_h => $::WIDTH / 80,
1740 vertical => 0, 2013 vertical => 0,
1741 can_hover => 1, 2014 can_hover => 1,
1742 inner_pad => 5, 2015 inner_pad => 5,
1743 @_ 2016 @_
1744 ); 2017 );
… …
1854 2127
1855sub new { 2128sub new {
1856 my $class = shift; 2129 my $class = shift;
1857 2130
1858 my $self = $class->SUPER::new ( 2131 my $self = $class->SUPER::new (
1859 fontsize => 1, 2132 fontsize => 1,
2133 can_events => 0,
2134 #font => default_font
1860 @_, 2135 @_,
1861 2136
1862 layout => (new CFClient::Layout), 2137 layout => (new CFClient::Layout),
1863 par => [], 2138 par => [],
1864 height => 0, 2139 height => 0,
1865 children => [ 2140 children => [
1866 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
1868 ], 2143 ],
1869 ); 2144 );
1870 2145
1871 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
1872 $self->update;
1873 });
1874 2147
1875 $self 2148 $self
1876} 2149}
1877 2150
1878sub set_fontsize { 2151sub set_fontsize {
… …
1886 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
1887 2160
1888 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
1889 2162
1890 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
1892 $layout->set_text ($text); 2165 $layout->set_text ($text);
1893 2166
1894 ($layout->size)[1] 2167 ($layout->size)[1]
1895} 2168}
1896 2169
… …
1904sub size_allocate { 2177sub size_allocate {
1905 my ($self, $w, $h) = @_; 2178 my ($self, $w, $h) = @_;
1906 2179
1907 $self->SUPER::size_allocate ($w, $h); 2180 $self->SUPER::size_allocate ($w, $h);
1908 2181
2182 $self->{layout}->set_font ($self->{font}) if $self->{font};
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2183 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910 $self->{layout}->set_width ($self->{children}[0]{w}); 2184 $self->{layout}->set_width ($self->{children}[0]{w});
1911 2185
1912 $self->reflow; 2186 $self->reflow;
1913} 2187}
… …
1948 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1949 2223
1950 delete $self->{texture}; 2224 delete $self->{texture};
1951 } 2225 }
1952 2226
1953 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1954 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
1955 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
1956 2230
1957 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
1958 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1959 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
1966 2240
1967 my $y = 0; 2241 my $y = 0;
1968 2242
1969 my $layout = $self->{layout}; 2243 my $layout = $self->{layout};
1970 2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246
1971 for my $par (@{$self->{par}}) { 2247 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2248 my $h = $par->[0];
1973 2249
1974 if ($y0 < $y + $h && $y < $y1) { 2250 if ($y0 < $y + $h && $y < $y1) {
1975 $layout->set_text ($par->[2]); 2251 $layout->set_text ($par->[2]);
… …
1989} 2265}
1990 2266
1991sub _draw { 2267sub _draw {
1992 my ($self) = @_; 2268 my ($self) = @_;
1993 2269
1994 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1995 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1;
1997 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1998 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
1999 } 2277 glDisable GL_BLEND;
2000 2278
2001 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2002 2280
2003} 2281}
2004 2282
… …
2052 2330
2053sub new { 2331sub new {
2054 my $class = shift; 2332 my $class = shift;
2055 2333
2056 my $self = $class->SUPER::new ( 2334 my $self = $class->SUPER::new (
2057 state => 0, 2335 state => 0,
2058 connect_activate => \&toggle_flopper, 2336 connect_activate => \&toggle_flopper,
2059 @_ 2337 @_
2060 ); 2338 );
2061 2339
2062 if ($self->{state}) { 2340 if ($self->{state}) {
… …
2083 $self->emit (changed => $self->{state}); 2361 $self->emit (changed => $self->{state});
2084} 2362}
2085 2363
2086############################################################################# 2364#############################################################################
2087 2365
2366package CFClient::UI::Tooltip;
2367
2368our @ISA = CFClient::UI::Bin::;
2369
2370use CFClient::OpenGL;
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 @_,
2377 can_events => 0,
2378 )
2379}
2380
2381sub set_markup {
2382 my ($self, $text) = @_;
2383
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2385 $self->{label}->set_markup ($text);
2386 $self->add ($self->{label});
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395
2396 ($w + 4, $h + 4)
2397}
2398
2399sub size_allocate {
2400 my ($self, $w, $h) = @_;
2401
2402 $self->SUPER::size_allocate ($w - 4, $h - 4);
2403}
2404
2405sub _draw {
2406 my ($self) = @_;
2407
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375;
2410
2411 my ($w, $h) = @$self{qw(w h)};
2412
2413 glColor 1, 0.8, 0.4;
2414 glBegin GL_QUADS;
2415 glVertex 0 , 0;
2416 glVertex 0 , $h;
2417 glVertex $w, $h;
2418 glVertex $w, 0;
2419 glEnd;
2420
2421 glColor 0, 0, 0;
2422 glBegin GL_LINE_LOOP;
2423 glVertex 0 , 0;
2424 glVertex 0 , $h;
2425 glVertex $w, $h;
2426 glVertex $w, 0;
2427 glEnd;
2428
2429 glPopMatrix;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw;
2433}
2434
2435#############################################################################
2436
2437package CFClient::UI::Face;
2438
2439our @ISA = CFClient::UI::Base::;
2440
2441use CFClient::OpenGL;
2442
2443sub new {
2444 my $class = shift;
2445
2446 $class->SUPER::new (
2447 aspect => 1,
2448 @_,
2449 )
2450}
2451
2452sub size_request {
2453 (32, 8)
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 return unless $::CONN;#d# manage and cache textures differently
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2461
2462 # TODO animation
2463 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 }
2473}
2474
2475#############################################################################
2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::Menu;
2583
2584our @ISA = CFClient::UI::FancyFrame::;
2585
2586use CFClient::OpenGL;
2587
2588sub new {
2589 my $class = shift;
2590
2591 my $self = $class->SUPER::new (
2592 items => [],
2593 z => 100,
2594 @_,
2595 );
2596
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598
2599 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item;
2601
2602 # handle various types of items, only text for now
2603 if (!ref $widget) {
2604 $widget = new CFClient::UI::Label
2605 can_hover => 1,
2606 can_events => 1,
2607 text => $widget;
2608 }
2609
2610 $self->{item}{$widget} = $item;
2611
2612 $self->{vbox}->add ($widget);
2613 }
2614
2615 $self
2616}
2617
2618# popup given the event (must be a mouse button down event currently)
2619sub popup {
2620 my ($self, $ev) = @_;
2621
2622 $self->emit ("popdown");
2623
2624 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self;
2626 $self->{button} = $ev->{button};
2627
2628 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630}
2631
2632sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER};
2638}
2639
2640sub button_up {
2641 my ($self, $ev, $x, $y) = @_;
2642
2643 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB;
2645 $self->hide;
2646
2647 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover};
2649 }
2650}
2651
2652#############################################################################
2653
2088package CFClient::UI::Root; 2654package CFClient::UI::Root;
2089 2655
2090our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2091 2657
2092use CFClient::OpenGL; 2658use CFClient::OpenGL;
2093 2659
2094sub check_size { 2660sub new {
2095 my ($self) = @_; 2661 my $class = shift;
2096 2662
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 2663 $class->SUPER::new (
2098} 2664 @_,
2099 2665 )
2100sub size_request {
2101 ($::WIDTH, $::HEIGHT)
2102} 2666}
2103 2667
2104sub configure { 2668sub configure {
2105 my ($self, $x, $y, $w, $h) = @_; 2669 my ($self, $x, $y, $w, $h) = @_;
2106 2670
2107 $self->SUPER::configure ($x, $y, $w, $h); 2671 $self->{w} = $w;
2108 2672 $self->{h} = $h;
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2110 for @{$self->{children}};
2111} 2673}
2112 2674
2113sub _topleft { 2675sub check_size {
2676 my ($self) = @_;
2677
2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2680}
2681
2682sub size_request {
2683 my ($self) = @_;
2684
2685 ($self->{w}, $self->{h})
2686}
2687
2688sub size_allocate {
2689 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2707 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2712 $child->configure ($X, $Y, $W, $H);
2713 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2114 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2115 2721
2116 ($x, $y) 2722 ($x, $y)
2117} 2723}
2118 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2119sub update { 2731sub update {
2120 my ($self) = @_; 2732 my ($self) = @_;
2121 2733
2122 $self->check_size; 2734 $self->check_size;
2123 ::refresh (); 2735 $::WANT_REFRESH++;
2124} 2736}
2125 2737
2126sub add { 2738sub add {
2127 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2128 2740
2129 # integerize window positions 2741 # integerise window positions
2130 $child->{x} = int $child->{x}; 2742 $child->{x} = int $child->{x};
2131 $child->{y} = int $child->{y}; 2743 $child->{y} = int $child->{y};
2132 2744
2133 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2134} 2746}
… …
2137 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2138 2750
2139 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2140} 2752}
2141 2753
2142sub draw { 2754sub draw {
2143 my ($self) = @_; 2755 my ($self) = @_;
2144 2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795
2145 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2146 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2147 } 2799 }
2148 2800
2149 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2150 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2151 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;
… …
2162############################################################################# 2814#############################################################################
2163 2815
2164package CFClient::UI; 2816package CFClient::UI;
2165 2817
2166$ROOT = new CFClient::UI::Root; 2818$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip;
2167 2820
21681 28211
2169 2822

Diff Legend

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