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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
17our %WIDGET; # all widgets, weak-referenced
18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
20 23
21 if ($TOOLTIP->{owner} != $widget) { 24 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 25 $TOOLTIP->{owner} = $widget;
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
67} 83}
68 84
69sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
70 my ($ev) = @_; 86 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
72 88
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 90
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 92
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
78 97
79 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 100 $grab->update if $grab;
82 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 118
100 check_tooltip; 119 check_tooltip;
101 } 120 }
102 121
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
104} 126}
105 127
106# convert position array to integers 128# convert position array to integers
107sub harmonize { 129sub harmonize {
108 my ($vals) = @_; 130 my ($vals) = @_;
114 $rem += $_ - $i; 136 $rem += $_ - $i;
115 $_ = $i; 137 $_ = $i;
116 } 138 }
117} 139}
118 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
161 }
162}
163
119############################################################################# 164#############################################################################
120 165
121package CFClient::UI::Base; 166package CFClient::UI::Base;
122 167
123use strict; 168use strict;
126 171
127sub new { 172sub new {
128 my $class = shift; 173 my $class = shift;
129 174
130 my $self = bless { 175 my $self = bless {
131 x => 0, 176 x => 0,
132 y => 0, 177 y => 0,
133 z => 0, 178 z => 0,
134 can_events => 1, 179 can_events => 1,
135 @_ 180 @_
136 }, $class; 181 }, $class;
137 182
138 for (keys %$self) { 183 for (keys %$self) {
139 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
141 } 186 }
142 } 187 }
143 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
144 $self 191 $self
145} 192}
146 193
194sub destroy {
195 my ($self) = @_;
196
197 $self->hide;
198 %$self = ();
199}
200
147sub show { 201sub show {
148 my ($self) = @_; 202 my ($self) = @_;
149 203
150 return if $self->{parent}; 204 return if $self->{parent};
151 205
153} 207}
154 208
155sub hide { 209sub hide {
156 my ($self) = @_; 210 my ($self) = @_;
157 211
158 return unless $self->{parent}; 212 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self;
159 214
160 $self->{parent}->remove ($self); 215 $self->{parent}->remove ($self)
216 if $self->{parent};
161} 217}
162 218
163sub move { 219sub move {
164 my ($self, $x, $y, $z) = @_; 220 my ($self, $x, $y, $z) = @_;
165 221
168 $self->{z} = $z if defined $z; 224 $self->{z} = $z if defined $z;
169 225
170 $self->update; 226 $self->update;
171} 227}
172 228
173sub needs_redraw { 229sub set_size {
174 0 230 my ($self, $w, $h) = @_;
231
232 $self->{user_w} = $w;
233 $self->{user_h} = $h;
234
235 $self->check_size;
175} 236}
176 237
177sub size_request { 238sub size_request {
178 require Carp; 239 require Carp;
179 Carp::confess "size_request is abstract"; 240 Carp::confess "size_request is abstract";
199 $self->{y} = $y; 260 $self->{y} = $y;
200 $self->update; 261 $self->update;
201 } 262 }
202 263
203 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 266 }
210} 267}
211 268
212sub size_allocate { 269sub size_allocate {
213 # nothing to be done 270 # nothing to be done
214} 271}
215 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children {
281}
282
216sub set_max_size { 283sub set_max_size {
217 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
218 285
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 288}
222 289
223# return top left coordinates 290sub set_tooltip {
224sub _topleft {
225 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
226 292
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
228} 299}
229 300
230# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
231sub coord2local { 302sub coord2local {
232 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
233 304
234 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 306}
237 307
238# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
239sub coord2global { 309sub coord2global {
240 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
241 311
242 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 313}
245 314
246sub focus_in { 315sub focus_in {
247 my ($self) = @_; 316 my ($self) = @_;
248 317
308 glVertex $x + $self->{w}, $y + $self->{h}; 377 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 378 glVertex $x , $y + $self->{h};
310 glEnd; 379 glEnd;
311 glDisable GL_BLEND; 380 glDisable GL_BLEND;
312 } 381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0;
389 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h};
392 glEnd;
393 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 }
313} 396}
314 397
315sub _draw { 398sub _draw {
316 my ($self) = @_; 399 my ($self) = @_;
317 400
332 415
333sub set_parent { 416sub set_parent {
334 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
335 418
336 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
337} 424}
338 425
339sub check_size { 426sub check_size {
340 my ($self) = @_; 427 my ($self, $forced) = @_;
341 428
342 return unless $self->{parent}; 429 $self->{force_alloc} = 1 if $forced;
343 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352} 431}
353 432
354sub update { 433sub update {
355 my ($self) = @_; 434 my ($self) = @_;
356 435
365} 444}
366 445
367sub emit { 446sub emit {
368 my ($self, $signal, @args) = @_; 447 my ($self, $signal, @args) = @_;
369 448
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 450}
374 451
375sub DESTROY { 452sub DESTROY {
376 my ($self) = @_; 453 my ($self) = @_;
377 454
455 delete $WIDGET{$self+0};
378 #$self->deactivate; 456 #$self->deactivate;
379} 457}
380 458
381############################################################################# 459#############################################################################
382 460
391 my $class = shift; 469 my $class = shift;
392 470
393 # range [value, low, high, page] 471 # range [value, low, high, page]
394 472
395 $class->SUPER::new ( 473 $class->SUPER::new (
396 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
397 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
398 @_ 476 @_
399 ) 477 )
400} 478}
401 479
402sub _draw { 480sub _draw {
403 my ($self) = @_; 481 my ($self) = @_;
404 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
405 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
406 489
407 glEnable GL_BLEND; 490 glEnable GL_BLEND;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
410 493
411 glBegin GL_QUADS; 494 glBegin GL_QUADS;
412 glVertex 0 , 0; 495 glVertex 0 , 0;
413 glVertex 0 , $h; 496 glVertex 0 , $h;
414 glVertex $w, $h; 497 glVertex $w, $h;
415 glVertex $w, 0; 498 glVertex $w, 0;
416 glEnd; 499 glEnd;
417 500
418 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
419} 503}
420 504
421############################################################################# 505#############################################################################
422 506
423package CFClient::UI::Empty; 507package CFClient::UI::Empty;
444sub new { 528sub new {
445 my ($class, %arg) = @_; 529 my ($class, %arg) = @_;
446 530
447 my $children = delete $arg{children} || []; 531 my $children = delete $arg{children} || [];
448 532
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 533 my $self = $class->SUPER::new (
534 children => [],
535 can_events => 0,
536 %arg,
537 );
450 $self->add ($_) for @$children; 538 $self->add ($_) for @$children;
451 539
452 $self 540 $self
453} 541}
454 542
455sub add { 543sub add {
456 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
457 545
458 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
459 548
460 use sort 'stable'; 549 use sort 'stable';
461 550
462 $self->{children} = [ 551 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
465 ]; 554 ];
466 555
467 $child->check_size; 556 $self->check_size (1);
557 $self->update;
558}
559
560sub children {
561 @{ $_[0]{children} }
468} 562}
469 563
470sub remove { 564sub remove {
471 my ($self, $child) = @_; 565 my ($self, $child) = @_;
472 566
473 delete $child->{parent}; 567 delete $child->{parent};
568 $child->hide;
474 569
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571
572 $self->check_size;
573 $self->update;
574}
575
576sub clear {
577 my ($self) = @_;
578
579 my $children = delete $self->{children};
580 $self->{children} = [];
581
582 for (@$children) {
583 delete $_->{parent};
584 $_->hide;
585 }
476 586
477 $self->check_size; 587 $self->check_size;
478 $self->update; 588 $self->update;
479} 589}
480 590
558} 668}
559 669
560sub update { 670sub update {
561 my ($self) = @_; 671 my ($self) = @_;
562 672
563 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 674 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 675}
577 676
578sub size_allocate { 677sub size_allocate {
579 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
580 679
581 $self->child->configure (0, 0, $w, $h); 680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
582 683
684sub _render {
685 $_[0]{children}[0]->draw;
686}
687
688sub render_child {
689 my ($self) = @_;
690
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT;
694
583 $self->render_chld; 695 $self->_render;
696 };
584} 697}
585 698
586sub _draw { 699sub _draw {
587 my ($self) = @_; 700 my ($self) = @_;
588 701
589 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
590 703
591 my $tex = $self->{texture} 704 my $tex = $self->{texture}
592 or return; 705 or return;
593 706
594 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1;
598 710
599 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600 712
601 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
603} 714}
604 715
605############################################################################# 716#############################################################################
606 717
607package CFClient::UI::ViewPort; 718package CFClient::UI::ViewPort;
608 719
609our @ISA = CFClient::UI::Window::; 720our @ISA = CFClient::UI::Window::;
610 721
611sub new { die }
612
613sub size_request { 722sub size_request {
614 my ($self) = @_; 723 my ($self) = @_;
615 724
616 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 727
619 @$self{qw(child_w child_h)} 728 @$self{qw(child_w child_h)}
620} 729}
621 730
622sub _draw { 731sub size_allocate {
623 my ($self) = @_; 732 my ($self, $w, $h) = @_;
624 733
625 $self->{children}[1]->draw; 734 $self->update;
626} 735}
627 736
737sub set_offset {
738 my ($self, $x, $y) = @_;
628 739
629############################################################################# 740 $self->{view_x} = int $x;
741 $self->{view_y} = int $y;
630 742
743 $self->update;
744}
745
746# hmm, this does not work for topleft of $self... but we should not ask for that
747sub coord2local {
748 my ($self, $x, $y) = @_;
749
750 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
751}
752
753sub coord2global {
754 my ($self, $x, $y) = @_;
755
756 $x = List::Util::min $self->{w}, $x - $self->{view_x};
757 $y = List::Util::min $self->{h}, $y - $self->{view_y};
758
759 $self->SUPER::coord2global ($x, $y)
760}
761
762sub find_widget {
763 my ($self, $x, $y) = @_;
764
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) {
768 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
769 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y)
771 }
772}
773
774sub _render {
775 my ($self) = @_;
776
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778
779 $self->SUPER::_render;
780}
781
782#############################################################################
783
631package CFClient::UI::Frame; 784package CFClient::UI::ScrolledWindow;
632 785
633our @ISA = CFClient::UI::Bin::; 786our @ISA = CFClient::UI::HBox::;
634
635use CFClient::OpenGL;
636 787
637sub new { 788sub new {
638 my $class = shift; 789 my $class = shift;
639 790
791 my $self;
792
793 my $slider = new CFClient::UI::Slider
794 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
798 },
799 ;
800
640 my $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
641 bg => [1, 1, 1, 1], 802 vp => (new CFClient::UI::ViewPort),
642 border_bg => [1, 1, 1, 1], 803 slider => $slider,
643 border => 0.8,
644 @_ 804 @_,
645 ); 805 );
646 806
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider});
810
647 $self 811 $self
648} 812}
649 813
650sub set_size { 814#TODO# update range on size_allocate depending on child
651 my ($self, $w, $h) = @_; 815# update viewport offset on scroll
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656 816
657sub size_request { 817#############################################################################
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661 818
662sub size_allocate { 819package CFClient::UI::Frame;
663 my ($self, $w, $h) = @_; 820
664 $self->{w} = $w; 821our @ISA = CFClient::UI::Bin::;
665 $self->{h} = $h; 822
666 $self->child->configure (0, 0, $w, $h); 823use CFClient::OpenGL;
824
825sub new {
826 my $class = shift;
827
828 $class->SUPER::new (
829 bg => undef,
830 @_,
831 )
667} 832}
668 833
669sub _draw { 834sub _draw {
670 my ($self) = @_; 835 my ($self) = @_;
671 836
672 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
673 839
674 glEnable GL_BLEND; 840 glEnable GL_BLEND;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678 843
679# glBegin GL_QUADS; 844 glBegin GL_QUADS;
680# glColor 0, 0, 0, 0;
681# glVertex 0 , 0; 845 glVertex 0 , 0;
682# glVertex 0 , $h; 846 glVertex 0 , $h;
683# glVertex $w, $h; 847 glVertex $w, $h;
684# glVertex $w, 0; 848 glVertex $w, 0;
685# glEnd; 849 glEnd;
686 850
687
688 $self->child->draw;
689 glDisable GL_BLEND; 851 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
691} 855}
692 856
693############################################################################# 857#############################################################################
694 858
695package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
706 my $class = shift; 870 my $class = shift;
707 871
708 # TODO: user_x, user_y, overwrite moveto? 872 # TODO: user_x, user_y, overwrite moveto?
709 873
710 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
713 border => 0.8, 877 border => 0.6,
878 toplevel => 1,
714 can_events => 1, 879 can_events => 1,
715 @_ 880 @_
716 ); 881 );
717 882
718 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 884 align => 0,
720 valign => 1, 885 valign => 1,
721 text => $self->{title}, 886 text => $self->{title},
722 fontsize => 1; 887 fontsize => $self->{border};
723 888
724 $self 889 $self
725} 890}
726 891
727sub border { 892sub border {
728 int $_[0]{border} * $::FONTSIZE 893 int $_[0]{border} * $::FONTSIZE
729} 894}
730 895
731sub size_request { 896sub size_request {
732 my ($self) = @_; 897 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 898
736 my ($w, $h) = $self->SUPER::size_request; 899 my ($w, $h) = $self->SUPER::size_request;
737 900
738 ( 901 (
739 $w + $self->border * 2, 902 $w + $self->border * 2,
745 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
746 909
747 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
748 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
749 912
750 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
751 if $self->{title}; 914 if $self->{title};
752 915
753 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
754} 917}
755 918
756sub button_down { 919sub button_down {
757 my ($self, $ev, $x, $y) = @_; 920 my ($self, $ev, $x, $y) = @_;
758 921
922 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 923 my $border = $self->border;
760 924
761 if ($x < $self->{w} && $x >= $self->{w} - $border 925 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 926 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 927
928 if ($lr & $td) {
929 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 930 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 931 my ($bw, $bh) = ($self->{w}, $self->{h});
766 932
933 my $mx = $x < $border;
934 my $my = $y < $border;
935
767 $self->{motion} = sub { 936 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 937 my ($ev, $x, $y) = @_;
769 938
770 ($x, $y) = ($ev->{x}, $ev->{y}); 939 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy;
771 941
772 $self->{user_w} = $bw + $x - $ox; 942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 945 $self->check_size;
775 }; 946 };
776 947
777 } elsif ($x >= 0 && $x < $self->{w} 948 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 949 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 950 my ($bx, $by) = ($self->{x}, $self->{y});
782 951
783 $self->{motion} = sub { 952 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 953 my ($ev, $x, $y) = @_;
807 my ($self) = @_; 976 my ($self) = @_;
808 977
809 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
810 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811 980
812 glEnable GL_BLEND;
813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816 983
817 my $border = $self->border; 984 my $border = $self->border;
818 985
819 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
820 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
824 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 993 my $bg = $tex[0];
826 994
827 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
830 998
831 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
832 1000
833 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
837 1006
838 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND;
840 1008
841 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
1010
842 $self->child->draw; 1011 $self->child->draw;
843} 1012}
844 1013
845############################################################################# 1014#############################################################################
846 1015
868 $self->{children}[$y][$x] = $child; 1037 $self->{children}[$y][$x] = $child;
869 1038
870 $child->check_size; 1039 $child->check_size;
871} 1040}
872 1041
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
873# TODO: move to container class maybe? send childs a signal on removal? 1046# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 1047sub clear {
875 my ($self) = @_; 1048 my ($self) = @_;
876 1049
1050 my @children = $self->children;
877 delete $self->{children}; 1051 delete $self->{children};
1052
1053 for (@children) {
1054 delete $_->{parent};
1055 $_->hide;
1056 }
1057
878 $self->update; 1058 $self->update;
879} 1059}
880 1060
881sub get_wh { 1061sub get_wh {
882 my ($self) = @_; 1062 my ($self) = @_;
1059} 1239}
1060 1240
1061sub size_allocate { 1241sub size_allocate {
1062 my ($self, $w, $h) = @_; 1242 my ($self, $w, $h) = @_;
1063 1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1064 my $children = $self->{children}; 1246 my $children = $self->{children};
1065 1247
1066 my @h = map $_->{req_h}, @$children; 1248 my @h = map $_->{req_h}, @$children;
1067 1249
1068 my $req_h = List::Util::sum @h; 1250 my $req_h = List::Util::sum @h;
1097 1279
1098############################################################################# 1280#############################################################################
1099 1281
1100package CFClient::UI::Label; 1282package CFClient::UI::Label;
1101 1283
1102our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1103 1285
1104use CFClient::OpenGL; 1286use CFClient::OpenGL;
1105 1287
1106sub new { 1288sub new {
1107 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1108 1290
1109 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1111 #font => default_font 1295 #font => default_font
1296 #text => initial text
1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1300 layout => (new CFClient::Layout),
1112 fontsize => 1, 1301 fontsize => 1,
1113 text => "",
1114 align => -1, 1302 align => -1,
1115 valign => -1, 1303 valign => -1,
1116 padding => 2, 1304 padding => 2,
1117 layout => new CFClient::Layout,
1118 can_events => 0, 1305 can_events => 0,
1119 %arg 1306 %arg
1120 ); 1307 );
1121 1308
1122 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout; 1310 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template}); 1311 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout; 1312 $self->{template} = $layout;
1126 } 1313 }
1127 1314
1128 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1316 $self->set_markup (delete $self->{markup});
1317 } else {
1318 $self->set_text (delete $self->{text});
1319 }
1130 1320
1131 $self 1321 $self
1132} 1322}
1133 1323
1134sub escape_text { 1324sub escape($) {
1135 local $_ = $_[1]; 1325 local $_ = $_[0];
1136 1326
1137 s/&/&amp;/g; 1327 s/&/&amp;/g;
1138 s/>/&gt;/g; 1328 s/>/&gt;/g;
1139 s/</&lt;/g; 1329 s/</&lt;/g;
1140 1330
1141 $_[1] 1331 $_
1332}
1333
1334sub update {
1335 my ($self) = @_;
1336
1337 delete $self->{texture};
1338 $self->SUPER::update;
1142} 1339}
1143 1340
1144sub set_text { 1341sub set_text {
1145 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
1146 1343
1344 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text";
1346
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1147 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
1148 1349
1149 delete $self->{texture}; 1350 $self->update;
1150 $self->check_size; 1351 $self->check_size;
1151 $self->update;
1152} 1352}
1153 1353
1154sub set_markup { 1354sub set_markup {
1155 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
1156 1356
1357 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup";
1359
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1157 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
1158 1364
1159 delete $self->{texture}; 1365 $self->update;
1160 $self->check_size; 1366 $self->check_size;
1161 $self->update;
1162} 1367}
1163 1368
1164sub size_request { 1369sub size_request {
1165 my ($self) = @_; 1370 my ($self) = @_;
1166 1371
1167 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1168 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1169 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1170 1377
1171 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1172 1379
1173 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
1195sub set_fontsize { 1402sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1197 1404
1198 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1200 $self->check_size; 1409 $self->check_size;
1201 $self->update;
1202} 1410}
1203 1411
1204sub _draw { 1412sub _draw {
1205 my ($self) = @_; 1413 my ($self) = @_;
1206 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1207 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1211 new_from_layout CFClient::Texture $self->{layout} 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1212 }; 1436 };
1213 1437
1214 glEnable GL_BLEND;
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1440
1441 if ($tex->{format} == GL_ALPHA) {
1219 glColor @{$self->{fg}}; 1442 glColor @{$self->{fg}};
1220
1221 $self->{ox} = int (
1222 $self->{align} < 0 ? $self->{padding}
1223 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224 : ($self->{w} - $tex->{w}) * 0.5
1225 );
1226
1227 $self->{oy} = int (
1228 $self->{valign} < 0 ? $self->{padding}
1229 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230 : ($self->{h} - $tex->{h}) * 0.5
1231 );
1232
1233 $tex->draw_quad ($self->{ox}, $self->{oy}); 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1234 1447
1235 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1449}
1238 1450
1239############################################################################# 1451#############################################################################
1240 1452
1241package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
1246 1458
1247sub new { 1459sub new {
1248 my $class = shift; 1460 my $class = shift;
1249 1461
1250 $class->SUPER::new ( 1462 $class->SUPER::new (
1251 fg => [1, 1, 1], 1463 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1464 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1465 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1466 active_fg => [0, 0, 0],
1255 can_hover => 1, 1467 can_hover => 1,
1256 can_focus => 1, 1468 can_focus => 1,
1257 valign => 0, 1469 valign => 0,
1258 can_events => 1, 1470 can_events => 1,
1259 @_ 1471 @_
1260 ) 1472 )
1261} 1473}
1262 1474
1276 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1277 1489
1278 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1279} 1491}
1280 1492
1281sub get_text {
1282 $_[0]{text}
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 ($w + 1, $h) # add 1 for cursor
1291}
1292
1293sub size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1297}
1298
1299sub set_text { 1493sub set_text {
1300 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1301 1495
1302 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1303 $self->_set_text ($text); 1497 $self->_set_text ($text);
1304 $self->update; 1498 $self->update;
1499 $self->check_size;
1500}
1501
1502sub get_text {
1503 $_[0]{text}
1504}
1505
1506sub size_request {
1507 my ($self) = @_;
1508
1509 my ($w, $h) = $self->SUPER::size_request;
1510
1511 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1305} 1518}
1306 1519
1307sub key_down { 1520sub key_down {
1308 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1309 1522
1311 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1312 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1313 1526
1314 my $text = $self->get_text; 1527 my $text = $self->get_text;
1315 1528
1316 if ($sym == 8) { 1529 if ($uni == 8) {
1317 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1318 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1319 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1320 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1321 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1322 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1323 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1324 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1325 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1326 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1327 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1328 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1329 $self->emit ('escape'); 1542 $self->emit ('escape');
1330 } elsif ($uni) { 1543 } elsif ($uni) {
1331 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1332 } 1545 }
1333 1546
1334 $self->_set_text ($text); 1547 $self->_set_text ($text);
1335 $self->update; 1548 $self->update;
1549 $self->check_size;
1336} 1550}
1337 1551
1338sub focus_in { 1552sub focus_in {
1339 my ($self) = @_; 1553 my ($self) = @_;
1340 1554
1416 my ($self, $ev) = @_; 1630 my ($self, $ev) = @_;
1417 1631
1418 my $sym = $ev->{sym}; 1632 my $sym = $ev->{sym};
1419 1633
1420 if ($sym == 13) { 1634 if ($sym == 13) {
1635 unshift @{$self->{history}},
1636 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1639 $self->emit (activate => $txt);
1422 $self->update; 1640 $self->update;
1641
1642 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text;
1645 }
1646 if (@{$self->{history} || []} > 0) {
1647 $self->{history_pointer}++;
1648 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1649 $self->{history_pointer} = @{$self->{history} || []} - 1;
1650 }
1651 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1652 }
1653
1654 } elsif ($sym == CFClient::SDLK_DOWN) {
1655 $self->{history_pointer}--;
1656 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1657
1658 if ($self->{history_pointer} >= 0) {
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 } else {
1661 $self->set_text ($self->{history_saveback});
1662 }
1423 1663
1424 } else { 1664 } else {
1425 $self->SUPER::key_down ($ev); 1665 $self->SUPER::key_down ($ev);
1426 } 1666 }
1427 1667
1441 1681
1442sub new { 1682sub new {
1443 my $class = shift; 1683 my $class = shift;
1444 1684
1445 $class->SUPER::new ( 1685 $class->SUPER::new (
1446 padding => 4, 1686 padding => 4,
1447 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1450 can_hover => 1, 1689 can_hover => 1,
1451 align => 0, 1690 align => 0,
1452 valign => 0, 1691 valign => 0,
1453 can_events => 1, 1692 can_events => 1,
1454 @_ 1693 @_
1455 ) 1694 )
1456} 1695}
1457 1696
1471 1710
1472 if ($GRAB == $self) { 1711 if ($GRAB == $self) {
1473 $self->{fg} = $self->{active_fg}; 1712 $self->{fg} = $self->{active_fg};
1474 } 1713 }
1475 1714
1476 glEnable GL_BLEND;
1477 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478 glEnable GL_TEXTURE_2D; 1715 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1717 glColor 0, 0, 0, 1;
1481 1718
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1720
1484 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1722
1487 $self->SUPER::_draw; 1723 $self->SUPER::_draw;
1488} 1724}
1489 1725
1490############################################################################# 1726#############################################################################
1504 1740
1505 $class->SUPER::new ( 1741 $class->SUPER::new (
1506 padding => 2, 1742 padding => 2,
1507 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1508 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1509 state => 0, 1747 state => 0,
1510 can_hover => 1, 1748 can_hover => 1,
1511 @_ 1749 @_
1512 ) 1750 )
1513} 1751}
1537 1775
1538 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1539 1777
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 1779
1542 glEnable GL_BLEND; 1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1543 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546 my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548 $tex->draw_quad (0, 0, $s, $s); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 1785}
1553 1786
1554############################################################################# 1787#############################################################################
1555 1788
1556package CFClient::UI::Image; 1789package CFClient::UI::Image;
1599 glTranslate 0, -$self->{w}, 0; 1832 glTranslate 0, -$self->{w}, 0;
1600 1833
1601 ($w, $h) = ($h, $w); 1834 ($w, $h) = ($h, $w);
1602 } 1835 }
1603 1836
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 1839
1609 $tex->draw_quad (0, 0, $w, $h); 1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 1841
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1613} 1843}
1614 1844
1615############################################################################# 1845#############################################################################
1616 1846
1617package CFClient::UI::VGauge; 1847package CFClient::UI::VGauge;
1618 1848
1619our @ISA = CFClient::UI::Base::; 1849our @ISA = CFClient::UI::Base::;
1850
1851use List::Util qw(min max);
1620 1852
1621use CFClient::OpenGL; 1853use CFClient::OpenGL;
1622 1854
1623my %tex = ( 1855my %tex = (
1624 food => [ 1856 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1858 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1859 ],
1628 grace => [ 1860 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1861 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1862 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1863 ],
1632 hp => [ 1864 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1866 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1867 ],
1636 mana => [ 1868 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1870 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1871 ],
1640); 1872);
1641 1873
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1874# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1875sub new {
1662} 1894}
1663 1895
1664sub set_max { 1896sub set_max {
1665 my ($self, $max) = @_; 1897 my ($self, $max) = @_;
1666 1898
1899 return if $self->{max_val} == $max;
1900
1667 $self->{max_val} = $max; 1901 $self->{max_val} = $max;
1902 $self->update;
1668} 1903}
1669 1904
1670sub set_value { 1905sub set_value {
1671 my ($self, $val, $max) = @_; 1906 my ($self, $val, $max) = @_;
1672 1907
1673 $self->set_max ($max) 1908 $self->set_max ($max)
1674 if defined $max; 1909 if defined $max;
1675 1910
1676 $max = $self->{max_val}; 1911 return if $self->{val} == $val;
1912
1677 $self->{val} = $val; 1913 $self->{val} = $val;
1678
1679 $self->update; 1914 $self->update;
1680} 1915}
1681 1916
1682sub _draw { 1917sub _draw {
1683 my ($self) = @_; 1918 my ($self) = @_;
1684 1919
1685 my $tex = $tex{$self->{type}}; 1920 my $tex = $tex{$self->{type}};
1921 my ($t1, $t2, $t3) = @$tex;
1686 1922
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1923 my ($w, $h) = ($self->{w}, $self->{h});
1688 1924
1689 if ($self->{vertical}) { 1925 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1926 glRotate 90, 0, 0, 1;
1692 1928
1693 ($w, $h) = ($h, $w); 1929 ($w, $h) = ($h, $w);
1694 } 1930 }
1695 1931
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1932 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1933
1699 my $t1 = $tex->[0]; 1934 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1935 my $ycut2 = max 0, min 1, $ycut - 1;
1936
1937 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2);
1701 1939
1702 glEnable GL_BLEND; 1940 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1941 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1942 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1944
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1945 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1946 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1947 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1948 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1949 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1950 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1951 glEnd;
1717 1952
1953 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1954 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1955 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1956 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1957 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1958 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1959 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1960 glEnd;
1961
1962 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd;
1970 }
1725 1971
1726 glDisable GL_BLEND; 1972 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1973 glDisable GL_TEXTURE_2D;
1728} 1974}
1729 1975
1735 1981
1736sub new { 1982sub new {
1737 my ($class, %arg) = @_; 1983 my ($class, %arg) = @_;
1738 1984
1739 my $self = $class->SUPER::new ( 1985 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1986 tooltip => $arg{type},
1987 can_hover => 1,
1988 can_events => 1,
1741 %arg, 1989 %arg,
1742 ); 1990 );
1743 1991
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1992 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1993 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1994 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1995
1748 $self 1996 $self
1749} 1997}
1750 1998
1751sub set_fontsize { 1999sub set_fontsize {
1753 2001
1754 $self->{value}->set_fontsize ($fsize); 2002 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 2003 $self->{max} ->set_fontsize ($fsize);
1756} 2004}
1757 2005
2006sub set_max {
2007 my ($self, $max) = @_;
2008
2009 $self->{gauge}->set_max ($max);
2010 $self->{max}->set_text ($max);
2011}
2012
1758sub set_value { 2013sub set_value {
1759 my ($self, $val, $max) = @_; 2014 my ($self, $val, $max) = @_;
1760 2015
1761 $self->set_max ($max) 2016 $self->set_max ($max)
1762 if defined $max; 2017 if defined $max;
1763 2018
1764 $self->{gauge}->set_value ($val, $max); 2019 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 2020 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 2021}
1774 2022
1775############################################################################# 2023#############################################################################
1776 2024
1777package CFClient::UI::Slider; 2025package CFClient::UI::Slider;
1787 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1788 2036
1789sub new { 2037sub new {
1790 my $class = shift; 2038 my $class = shift;
1791 2039
1792 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
1793 2041
1794 # TODO: 0-width page 2042 # TODO: 0-width page
1795 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
1796 # TODO: calculations are off 2044 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
1800 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
1801 req_w => 20, 2051 req_w => $::WIDTH / 80,
1802 req_h => 20, 2052 req_h => $::WIDTH / 80,
1803 vertical => 0, 2053 vertical => 0,
1804 can_hover => 1, 2054 can_hover => 1,
1805 inner_pad => 5, 2055 inner_pad => .05,
1806 @_ 2056 @_
1807 ); 2057 );
1808 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
1809 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
1810} 2086}
1811 2087
1812sub size_request { 2088sub size_request {
1813 my ($self) = @_; 2089 my ($self) = @_;
1814 2090
1827 2103
1828sub mouse_motion { 2104sub mouse_motion {
1829 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
1830 2106
1831 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
1832 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
1833 2125
1834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
1835 2127
1836 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1837 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1838 2129
1839 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1840 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
1841 $x = $lo if $x < $lo;
1842 $x = $hi - $page if $x > $hi - $page;
1843 $self->{range}[0] = $x;
1844 2132
1845 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
1846 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
1847 } 2140 });
1848}
1849 2141
1850# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
1851# so that the handle doesn't leave the texture. This calculation isn't 100%
1852# correct propably, but it does the job for now
1853sub _calc_inner_pad_px {
1854 my ($self, $w) = @_;
1855 ($w / 100) * $self->{inner_pad} # % to pixels
1856} 2143}
1857 2144
1858sub _draw { 2145sub _draw {
1859 my ($self) = @_; 2146 my ($self) = @_;
1860 2147
1861 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
1862 2149
1863 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
1864 2151
1865 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
1866 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
1867 2154
2155 glTranslate 1, 0, 0;
1868 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
1869 glTranslate 0, -$self->{w}, 0;
1870
1871 ($w, $h) = ($h, $w);
1872 } 2157 }
1873 2158
1874 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1875 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1876 2161
1877 my ($value, $lo, $hi, $page) = @{$self->{range}};
1878
1879 $hi = $value + 1 if $lo == $hi;
1880
1881 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1882 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1883
1884 $page = int $page * $inner_w / ($hi - $lo);
1885 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1886
1887 $w -= $page;
1888 $page &= ~1;
1889 glTranslate $page * 0.5, 0, 0;
1890 $page ||= 2;
1891
1892 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894
1895 glEnable GL_BLEND;
1896 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2164
1900 # draw background 2165 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1902 2167
1903 # draw handle 2168 # draw handle
1904 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1905 2170
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
1908} 2172}
1909 2173
1910############################################################################# 2174#############################################################################
1911 2175
1917 2181
1918sub new { 2182sub new {
1919 my $class = shift; 2183 my $class = shift;
1920 2184
1921 my $self = $class->SUPER::new ( 2185 my $self = $class->SUPER::new (
1922 fontsize => 1, 2186 fontsize => 1,
2187 can_events => 0,
1923 #font => default_font 2188 #font => default_font
1924 @_, 2189 @_,
1925 2190
1926 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
1927 par => [], 2192 par => [],
1928 height => 0, 2193 height => 0,
1929 children => [ 2194 children => [
1930 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
1932 ], 2197 ],
1933 ); 2198 );
1934 2199
1935 $self->{children}[1]->connect (changed => sub { 2200 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2201
1939 $self 2202 $self
1940} 2203}
1941 2204
1942sub set_fontsize { 2205sub set_fontsize {
1950 my ($self, $text) = @_; 2213 my ($self, $text) = @_;
1951 2214
1952 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
1953 2216
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2218 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2219 $layout->set_markup ($text);
1957 2220
1958 ($layout->size)[1] 2221 ($layout->size)[1]
1959} 2222}
1960 2223
1961sub reflow { 2224sub reflow {
1999 2262
2000 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2001 2264
2002 delete $self->{texture}; 2265 delete $self->{texture};
2003 2266
2004 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2005 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2006 my $height = 0; 2269 my $height = 0;
2007 2270
2008 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2009 for @{$self->{par}}; 2272 for @{$self->{par}};
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2277
2015 delete $self->{texture}; 2278 delete $self->{texture};
2016 } 2279 }
2017 2280
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019 glClearColor 0, 0, 0, 1; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2021 2284
2022 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 2287
2027 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
2028 2289
2037 2298
2038 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2300 my $h = $par->[0];
2040 2301
2041 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2042 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
2043 2305
2044 glColor @{ $par->[1] };
2045 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
2046 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2047 } 2308 }
2048 2309
2049 $y += $h; 2310 $y += $h;
2050 } 2311 }
2051 2312
2052 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND;
2054 }; 2314 };
2055 }); 2315 });
2056} 2316}
2057 2317
2058sub _draw { 2318sub _draw {
2059 my ($self) = @_; 2319 my ($self) = @_;
2060 2320
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2066 }
2067 2326
2068 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2069 2328
2070} 2329}
2071 2330
2119 2378
2120sub new { 2379sub new {
2121 my $class = shift; 2380 my $class = shift;
2122 2381
2123 my $self = $class->SUPER::new ( 2382 my $self = $class->SUPER::new (
2124 state => 0, 2383 state => 0,
2125 connect_activate => \&toggle_flopper, 2384 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2385 @_
2128 ); 2386 );
2129 2387
2130 if ($self->{state}) { 2388 if ($self->{state}) {
2131 $self->{state} = 0; 2389 $self->{state} = 0;
2166 @_, 2424 @_,
2167 can_events => 0, 2425 can_events => 0,
2168 ) 2426 )
2169} 2427}
2170 2428
2171sub set_text { 2429sub set_tooltip_from {
2172 my ($self, $text) = @_; 2430 my ($self, $widget) = @_;
2173 2431
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2432 $self->add (new CFClient::UI::Label
2175 $self->{label}->set_text ($text); 2433 markup => $widget->{tooltip},
2176 $self->add ($self->{label}); 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8,
2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 );
2177} 2440}
2178 2441
2179sub size_request { 2442sub size_request {
2180 my ($self) = @_; 2443 my ($self) = @_;
2181 2444
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2446
2186 ($w + 4, $h + 4) 2447 ($w + 4, $h + 4)
2187} 2448}
2188 2449
2450sub size_allocate {
2451 my ($self, $w, $h) = @_;
2452
2453 $self->SUPER::size_allocate ($w - 4, $h - 4);
2454}
2455
2189sub _draw { 2456sub _draw {
2190 my ($self) = @_; 2457 my ($self) = @_;
2191 2458
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2194 2460
2195 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2196 2462
2197 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
2208 glVertex 0 , $h; 2474 glVertex 0 , $h;
2209 glVertex $w, $h; 2475 glVertex $w, $h;
2210 glVertex $w, 0; 2476 glVertex $w, 0;
2211 glEnd; 2477 glEnd;
2212 2478
2213 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2214
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2217} 2481}
2218 2482
2219############################################################################# 2483#############################################################################
2220 2484
2485package CFClient::UI::Face;
2486
2487our @ISA = CFClient::UI::Base::;
2488
2489use CFClient::OpenGL;
2490
2491sub new {
2492 my $class = shift;
2493
2494 $class->SUPER::new (
2495 aspect => 1,
2496 @_,
2497 )
2498}
2499
2500sub size_request {
2501 (32, 8)
2502}
2503
2504sub _draw {
2505 my ($self) = @_;
2506
2507 return unless $::CONN;#d# manage and cache textures differently
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2509
2510 # TODO animation
2511 if ($tex) {
2512 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D;
2517 }
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::InventoryItem;
2523
2524our @ISA = CFClient::UI::HBox::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669
2670#############################################################################
2671
2672package CFClient::UI::Menu;
2673
2674our @ISA = CFClient::UI::FancyFrame::;
2675
2676use CFClient::OpenGL;
2677
2678sub new {
2679 my $class = shift;
2680
2681 my $self = $class->SUPER::new (
2682 items => [],
2683 z => 100,
2684 @_,
2685 );
2686
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2688
2689 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item;
2691
2692 # handle various types of items, only text for now
2693 if (!ref $widget) {
2694 $widget = new CFClient::UI::Label
2695 can_hover => 1,
2696 can_events => 1,
2697 text => $widget;
2698 }
2699
2700 $self->{item}{$widget} = $item;
2701
2702 $self->{vbox}->add ($widget);
2703 }
2704
2705 $self
2706}
2707
2708# popup given the event (must be a mouse button down event currently)
2709sub popup {
2710 my ($self, $ev) = @_;
2711
2712 $self->emit ("popdown");
2713
2714 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self;
2716 $self->{button} = $ev->{button};
2717
2718 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720}
2721
2722sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER};
2728}
2729
2730sub button_up {
2731 my ($self, $ev, $x, $y) = @_;
2732
2733 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB;
2735 $self->hide;
2736
2737 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover};
2739 }
2740}
2741
2742#############################################################################
2743
2744package CFClient::UI::Statusbox;
2745
2746our @ISA = CFClient::UI::VBox::;
2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2754 )
2755}
2756
2757sub reorder {
2758 my ($self) = @_;
2759 my $NOW = time;
2760
2761 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 }
2764
2765 my @widgets;
2766
2767 my @items = sort {
2768 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} };
2771
2772 my $count = 10 + 1;
2773 for my $item (@items) {
2774 last unless --$count;
2775
2776 push @widgets, $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text};
2781
2782 for ($short) {
2783 s/^\s+//;
2784 s/\s+/ /g;
2785 }
2786
2787 new CFClient::UI::Label
2788 markup => $short,
2789 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2838}
2839
2840sub reconfigure {
2841 my ($self) = @_;
2842
2843 delete $_->{label}
2844 for values %{ $self->{item} || {} };
2845
2846 $self->reorder;
2847 $self->SUPER::reconfigure;
2848}
2849
2850#############################################################################
2851
2221package CFClient::UI::Root; 2852package CFClient::UI::Root;
2222 2853
2223our @ISA = CFClient::UI::Container::; 2854our @ISA = CFClient::UI::Container::;
2224 2855
2225use CFClient::OpenGL; 2856use CFClient::OpenGL;
2226 2857
2227sub check_size { 2858sub new {
2228 my ($self) = @_; 2859 my $class = shift;
2229 2860
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2861 $class->SUPER::new (
2231} 2862 @_,
2232 2863 )
2233sub size_request {
2234 ($::WIDTH, $::HEIGHT)
2235} 2864}
2236 2865
2237sub configure { 2866sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2867 my ($self, $x, $y, $w, $h) = @_;
2239 2868
2240 $self->SUPER::configure ($x, $y, $w, $h); 2869 $self->{w} = $w;
2870 $self->{h} = $h;
2871}
2241 2872
2873sub check_size {
2874 my ($self) = @_;
2875
2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2878}
2879
2880sub size_request {
2881 my ($self) = @_;
2882
2883 ($self->{w}, $self->{h})
2884}
2885
2886sub size_allocate {
2887 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2242 for my $child (@{$self->{children}}) { 2895 for my $child ($self->children) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244 2897
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x};
2900
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y};
2903
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906
2247 $child->configure ($X, $Y, $W,$H); 2907 $child->configure ($X, $Y, $W, $H);
2248 } 2908 }
2249} 2909}
2250 2910
2251sub _topleft { 2911sub coord2local {
2252 my ($self, $x, $y) = @_; 2912 my ($self, $x, $y) = @_;
2253 2913
2254 ($x, $y) 2914 ($x, $y)
2255} 2915}
2256 2916
2917sub coord2global {
2918 my ($self, $x, $y) = @_;
2919
2920 ($x, $y)
2921}
2922
2257sub update { 2923sub update {
2258 my ($self) = @_; 2924 my ($self) = @_;
2259 2925
2260 $self->check_size; 2926 $self->check_size;
2261 ::refresh (); 2927 $::WANT_REFRESH++;
2262} 2928}
2263 2929
2264sub add { 2930sub add {
2265 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2266 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2267 # integerize window positions 2936 # integerise window positions
2268 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2270 2940
2271 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2272} 2942}
2273 2943
2274sub on_refresh { 2944sub on_refresh {
2275 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2276 2946
2277 $self->{refresh_hook}{$id} = $cb; 2947 $self->{refresh_hook}{$id} = $cb;
2278} 2948}
2279 2949
2950sub on_post_alloc {
2951 my ($self, $id, $cb) = @_;
2952
2953 $self->{post_alloc_hook}{$id} = $cb;
2954}
2955
2280sub draw { 2956sub draw {
2281 my ($self) = @_; 2957 my ($self) = @_;
2282 2958
2283 while (my $rcb = delete $self->{refresh_hook}) { 2959 while ($self->{refresh_hook}) {
2284 $_->() for values %$rcb; 2960 $_->()
2961 for values %{delete $self->{refresh_hook}};
2962 }
2963
2964 if ($self->{check_size}) {
2965 my @queue = ([], []);
2966
2967 for (;;) {
2968 if ($self->{check_size}) {
2969 # heuristic: check containers last
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2971 for values %{delete $self->{check_size}}
2972 }
2973
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2975
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2977 ? @$widget{qw(user_w user_h)}
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983
2984 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h;
2986
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2988
2989 $widget->{parent}->check_size
2990 if $widget->{parent};
2991 }
2992 }
2993 }
2994
2995 while ($self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) {
2997 my ($widget, $w, $h) = @$_;
2998
2999 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0;
3001
3002 $widget->{w} = $w;
3003 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h);
3006 }
3007 }
3008
3009 while ($self->{post_alloc_hook}) {
3010 $_->()
3011 for values %{delete $self->{post_alloc_hook}};
2285 } 3012 }
2286 3013
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3014 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 3016 glClear GL_COLOR_BUFFER_BIT;
2300############################################################################# 3027#############################################################################
2301 3028
2302package CFClient::UI; 3029package CFClient::UI;
2303 3030
2304$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2306 3033
23071 30341
2308 3035

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines